Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,375 Commits 3 Branches 0 Tags
14ce2dded0f079c8f03bbffb6791767e63dc374e
Commit Graph

41230 Commits

Author SHA1 Message Date
Alan Viverette
14ce2dded0 am 084a8ea4: am b3a5b02a: am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '084a8ea4729c13f791015adb6c284bc3111f2796':
  Ensure we always have valid colors in CaptionStyle
 2014-09-17 14:13:49 +00:00
Robert Greenwalt
1fd891b8b6 am 4b975101: am 46d6a418: am 3a68c1e8: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit '4b9751019ff25b61b84e2a8c6955f38d727efb73':
  Report Network status to NetworkAgent.
 2014-09-17 14:13:31 +00:00
Craig Mautner
b4475e4d65 am fa26c157: am 0fb3fdab: am bfff2d63: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'fa26c15724693e90c6c32486cb0f4ec6f3fcc0a6':
  Restore changes that were needed.
 2014-09-17 14:13:27 +00:00
Craig Mautner
04f83f6577 am 05216ac8: am 675a6e4d: am 3d94fdac: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit '05216ac82ab73b3b0db3804516036d7902bbe380':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-17 14:13:10 +00:00
Craig Mautner
57377f37ec am 16600a52: am 73ccaa21: am af31daa1: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '16600a52c33168c83208d5227996c4a553e343dd':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-17 14:12:40 +00:00
Amit Mahajan
259d00f4a8 am 56a22fcf: am b2697356: am d425fd52: am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit '56a22fcfaf55f726e4dbb6cc4de7d4b74c6db745':
  Use Op package name when creating toasts
 2014-09-17 14:12:22 +00:00
Alan Viverette
ed65432aa3 am 8823d2cc: am f01a39bf: am 5191c40b: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '8823d2cc48d52d6aea3f3233d9bf44d302757763':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-17 05:14:55 +00:00
Jorim Jaggi
027eb7c874 am fb2fa955: am 185055cb: am dc29e524: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'fb2fa955e92e6066e21badebf16259acdcebae12':
  Use RenderThread for navigation bar ripples
 2014-09-17 05:14:49 +00:00
Martijn Coenen
181e1cab56 am 6d1b1735: am 616273b6: am 0268b22d: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '6d1b17352ede80eb46f2c79afd267d5d6460f0d4':
  Fix static AID prefix registration.
 2014-09-17 05:14:32 +00:00
Alan Viverette
6acb495af2 am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:30:46 +00:00
Alan Viverette
96f26b8039 Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 2014-09-16 23:20:28 +00:00
Robert Greenwalt
9d1723558b am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:35 +00:00
Craig Mautner
ea0dbf3fa2 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:11 +00:00
Robert Greenwalt
b4f601cb84 Merge "Report Network status to NetworkAgent." into lmp-dev 2014-09-16 22:59:33 +00:00
Alan Viverette
f1820064d9 Ensure we always have valid colors in CaptionStyle 
BUG: 17521623
Change-Id: I861aa189970fc14dd3e4426e5487a14f373d3a2e
 2014-09-16 15:53:33 -07:00
Craig Mautner
a67d9095b7 Restore changes that were needed. 
Reverting the changes in ag/548487 also reverted alanv's changes
in ag/547793. This restores alanv's changes.

Fixes build.

Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9
 2014-09-16 15:50:32 -07:00
Craig Mautner
a0610d425f am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'b53e4c4a3879b0a3e649e62a07734643ee3122ae':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:24:10 +00:00
Craig Mautner
704991224d Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 2014-09-16 22:16:29 +00:00
Craig Mautner
706b3547f8 Revert "Fix various bugs in DatePickerCalendarDelegate" 
alanv@ fixed this yesterday.

This reverts commit 82537efa4c5f4aad12b9aa249fb27eda21647f39.

Change-Id: If2b91ee36f8b24f695200ac1a87a306246ee5e44
 2014-09-16 22:13:39 +00:00
Craig Mautner
f5c84c8622 am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '459b2ba58c771d67f8d119b241e8dc4f7958dd97':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:40:31 +00:00
Craig Mautner
f6b4254bef Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 2014-09-16 21:30:29 +00:00
Martijn Coenen
93c08d9dba am b2a1f834: am 31c99f2a: am 648281cf: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'b2a1f834ab415d8d781ebae0e001dba5f4ad466a':
  AID prefix registration.
 2014-09-16 21:09:12 +00:00
Edward Jee
7f06e76389 am 61cde9ec: am cbb8f574: am f8c4ffa3: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '61cde9ec5b964a1041685a0c1ae0e225f4b2707c':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 21:08:33 +00:00
Igor Murashkin
573eede22f am 2747a375: am d510de9f: am 3615cb06: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit '2747a375aefba5ede12a7c321c2d0ea4aacbc78a':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 21:08:29 +00:00
Eino-Ville Talvala
b32ab8491f am 6ac529d2: am 5467f4f1: am b18fdbb1: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '6ac529d2aff9b16d2effc2c6e9db8a842c057495':
  Camera2: Check for sequence complete sooner.
 2014-09-16 21:08:20 +00:00
Alan Viverette
ac765b0097 am 31ae7352: am 99d0dbb3: am e656192b: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '31ae7352cc5ae8f9d46c76384bde1586283bee70':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 21:08:15 +00:00
Yohei Yukawa
f4bc3ba7f8 am ea4cc661: am 9c0fe70f: am 5d36afad: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit 'ea4cc66116f9ae5873c63214d7751294333e965c':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 21:08:06 +00:00
Ang Li
e61b8a094a am 07892ce9: am 1bac39de: am f24f708c: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit '07892ce97078b28ae38063d458bc0af6f5e72f4c':
  Fix a typo in comment.
 2014-09-16 21:08:01 +00:00
Chet Haase
235ee2d80a am 5d550b24: am fc75e5c9: am da8b72c4: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit '5d550b2473351dc17f40627f6c02a979a5ec6003':
  Avoid invalidating view during some outline invalidations
 2014-09-16 21:07:32 +00:00
Jeff Sharkey
cc3ba950cc am 3de2d914: am 5ec46e9e: am 30a8045d: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '3de2d9144e7f88a20e62c07999aa94789f4ad2e6':
  Update API naming to follow style guide.
 2014-09-16 21:07:22 +00:00
Chris Craik
29b964db7b am 64d546f2: am 52f7afb1: am 30d4b396: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit '64d546f2ec55cd7bc8de47272e80bdb9f5526b1a':
  Enable shadow for GhostView
 2014-09-16 21:07:12 +00:00
Ihab Awad
751b766747 am 5a2462c2: am d03f89c6: am d61d9150: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '5a2462c2fa163b426e6016804ffc7d40022048b7':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 21:07:02 +00:00
George Mount
a8c1d0232b am bd0d84df: am c18f3cff: am 6140df56: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit 'bd0d84df3bbda95affdf4cab0e597cc126919883':
  Fixed OOM due to visibility transitions.
 2014-09-16 21:04:02 +00:00
George Mount
71c0f7330b am 8c08a7e5: am 36f24d34: am f7dfba19: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '8c08a7e5bd11715b32645d0ff84626a2d9c3273c':
  Fixed enter/exit transitions working against shared elements.
 2014-09-16 21:03:57 +00:00
Eino-Ville Talvala
8e8318fdca am ee577ba4: am e3ca5a2e: am 949fc209: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit 'ee577ba4dea973f3e527c264f7c817ff7f69e4bf':
  Camera2: Clean up corner case error handling
 2014-09-16 21:03:52 +00:00
Andres Morales
7e8cc9f6b4 am f2feace6: am 5f3c1be8: am f02fab8c: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit 'f2feace67ee8f993fe46ef1a742a185fde5c50cc':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-16 21:03:35 +00:00
Craig Mautner
9c26b54d3c Fix various bugs in DatePickerCalendarDelegate 
These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
 2014-09-16 13:57:59 -07:00
Amit Mahajan
dfbd7494f7 am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit 'c5429d6feab77ad1e426afb5bddc6fcfda06d37e':
  Use Op package name when creating toasts
 2014-09-16 20:57:28 +00:00
Amit Mahajan
915a666c21 Merge "Use Op package name when creating toasts" into lmp-dev 2014-09-16 20:47:24 +00:00
Wink Saville
9bb67459b6 Merge commit 'edd57a98' into fix-conflict 
* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa
 2014-09-16 13:23:43 -07:00
Alan Viverette
e8e61c5438 am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '7194361cdaad9150f8440dda99ccdc04556e73e2':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:00:39 +00:00
Jorim Jaggi
b6f3e6eb7b am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'ac9804435867dfaaebe1887d6de30aee7758bb39':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:00:32 +00:00
Alan Viverette
328c630ab6 Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 2014-09-16 17:55:31 +00:00
Jorim Jaggi
072707dfad Use RenderThread for navigation bar ripples 
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
 2014-09-16 17:51:55 +00:00
Martijn Coenen
c23e98ad24 am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '415ef6926f06ba39bd366bd1d5a6115d0aead640':
  Fix static AID prefix registration.
 2014-09-16 17:49:39 +00:00
Martijn Coenen
9ed2d5f746 Merge "Fix static AID prefix registration." into lmp-dev 2014-09-16 17:40:30 +00:00
Tony Hill
929442d509 Use Op package name when creating toasts 
Some components may be running in processes other than their
base package using android:process directives. The op package
name must therefore be used otherwise the AppOps check will fail
due to a mismatch between the base package name and the UID.

Bug: 17431423
Change-Id: I429aa46066935b964151a2ec0854f0e14c117c4e
 2014-09-16 10:16:43 -07:00
Martijn Coenen
0985fb6c42 Fix static AID prefix registration. 
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
 2014-09-16 10:09:12 -07:00
Martijn Coenen
92dafc67db am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'cd108cbe643d824437e8a629aa258a62ad237b39':
  AID prefix registration.
 2014-09-16 15:04:53 +00:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00