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

44708 Commits

Author SHA1 Message Date
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
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
Adam Lesinski
30b9e90a12 am 221544f9: am 4f1f2dc4: am 17e0218d: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '221544f9a673ec4f157a1c760cf5a47cb9c336f1':
  Show the lockscreen when more than 1 user is present
 2014-09-16 21:08:24 +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
Adam Powell
8312978af7 am e4abf3f9: am d2b93415: am 752021f9: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit 'e4abf3f9628fd34c7d4f98951ab7b1fb7e6bc63c':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 21:07:57 +00:00
Adam Powell
d16d3ad715 am 28ac06fe: am 2ac58db5: am e608ab91: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '28ac06fe0b355ba4efff5d94c1f74a07e176c735':
  Finish materializing dialogs
 2014-09-16 21:07:49 +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
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
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
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
Edward Jee
d796159bbb am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:44:13 +00:00
Igor Murashkin
110a880342 am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit '6d2cca330f2bfd7e9fc4699f3e8248762454e344':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 08:44:09 +00:00
Adam Lesinski
3d52cb5da2 am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '1416621b4407fe8a1b488cface2be5743fa4b7a3':
  Show the lockscreen when more than 1 user is present
 2014-09-16 08:44:06 +00:00
Eino-Ville Talvala
f0a9713e18 am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '3703cae1eec5128f0f93ca873a06ca41e99b1805':
  Camera2: Check for sequence complete sooner.
 2014-09-16 08:44:02 +00:00
Alan Viverette
8f9fc07aa0 am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '1375db7006e58635912a2fafce1ede47ed10bac0':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 08:43:58 +00:00
Yohei Yukawa
ce0a930be2 am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '8219934a5569b14a3bc9223bc33164e2fe05c044':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 08:43:51 +00:00
Ang Li
909c459169 am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit '36fdf64f0305db556a448efae1b9f0241a3b5ee0':
  Fix a typo in comment.
 2014-09-16 08:43:47 +00:00
Adam Powell
7920c579dc am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '3b2dfa7a301d8e45b3e6f3c99f95b7ba27bb3bf2':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 08:43:43 +00:00
Adam Powell
3b1a9b3f69 am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '17ec7920bab6cbec4be42f4f0db8c8e6cc2f484e':
  Finish materializing dialogs
 2014-09-16 08:43:35 +00:00
Chet Haase
4aec3867fe am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit '4b20b03109947531f934bbeed819f522cf8f43b8':
  Avoid invalidating view during some outline invalidations
 2014-09-16 08:43:20 +00:00
Edward Jee
1bbfcc2fdc Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 2014-09-16 01:19:19 +00:00
Igor Murashkin
4e5eddff5e Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 2014-09-16 00:58:24 +00:00
Igor Murashkin
89bb63f395 camera2-legacy: Fix jpeg thumbnail quality not being set 
Bug: 17472049
Change-Id: I6ce9f2bb07def86bc58b4b2495c58ee6762a65e1
 2014-09-15 17:54:09 -07:00
Adam Lesinski
3846c1d261 Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 2014-09-16 00:50:23 +00:00
Eino-Ville Talvala
d701bfb615 Merge "Camera2: Check for sequence complete sooner." into lmp-dev 2014-09-16 00:47:29 +00:00
Adam Lesinski
61d9409239 Show the lockscreen when more than 1 user is present 
Bug:17399024
Change-Id: Iaf2ea2747cbcd9db45ba9faa7c8fe0389a799855
 2014-09-15 17:46:10 -07:00
Alan Viverette
7413501b9c Merge "Always apply ImageView's tint attribute using SRC_ATOP by default" into lmp-dev 2014-09-16 00:40:36 +00:00
Yohei Yukawa
84f20ec49d Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 2014-09-16 00:19:55 +00:00
Ang Li
85be272268 Merge "Fix a typo in comment." into lmp-dev 2014-09-16 00:00:37 +00:00
Adam Powell
afd3a3a049 Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 2014-09-15 23:55:34 +00:00
Adam Powell
ebff4063ba Merge "Finish materializing dialogs" into lmp-dev 2014-09-15 23:41:57 +00:00
Adam Powell
6192b07bdc Treat empty string as title-set in ToolbarWidgetWrapper 
If a developer explicitly sets the empty string as the title of a
Toolbar that is used as an action bar via Activity#setActionBar, don't
overwrite it with the window title. This clears up a nonintuitive
behavior when explicitly clearing the title of a toolbar.

Bug 17510951

Change-Id: I183c2ca57d3bd16ae1f89bb7daa2cdf086189138
 2014-09-15 16:36:01 -07:00
Eino-Ville Talvala
848fe733f3 Camera2: Check for sequence complete sooner. 
It's possible, especially with legacy mode, for a last frame for a
sequence to have already arrived when a repeating sequence is stopped.

In that case, need to check for sequence complete as soon as the
requestId, framenumber pair is added to the pending queue of completions.

Bug: 17428716
Change-Id: Ie5c6ea5a43639c812b8441da326c6303e150fce0
 2014-09-15 16:28:02 -07:00
Alan Viverette
38f93bcb21 Always apply ImageView's tint attribute using SRC_ATOP by default 
Preserves pre-L behavior and avoids requiring developers to manually
set the tintMode to SRC_ATOP when targeting SDK 21+.

BUG: 17507827
Change-Id: I43f86cbcb9662172254f46700441ca85a54428f6
 2014-09-15 16:25:09 -07:00
Chet Haase
18c56d0ac4 Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 2014-09-15 22:40:04 +00:00