drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,193 Commits 1 Branch 0 Tags
Commit Graph

151193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
0f2b44e7ab am bf5c26f5: Merge "Fixing Recents crash with non-primary user. (Bug 17343688)" into lmp-dev 
* commit 'bf5c26f50b3b8dd48dcc94d4a39a5094f8494237':
  Fixing Recents crash with non-primary user. (Bug 17343688)
 2014-09-03 15:34:37 +00:00
Chet Haase
2ceba249eb am aa83bc85: Merge "Fix behavior of inflating InsetDrawable" into lmp-dev 
* commit 'aa83bc85c0e27feb9d376c6e786a9666dedbf231':
  Fix behavior of inflating InsetDrawable
 2014-09-03 15:34:32 +00:00
Jorim Jaggi
2f25ab5b52 am 44542c46: Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev 
* commit '44542c4672eb2dc8626beace99dda809f73ba2ae':
  Improve subpixel rendering of battery icon on all densities
 2014-09-03 15:34:28 +00:00
Selim Cinek
5d035c145b am 6dbb3ec5: Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev 
* commit '6dbb3ec5d1d7e88e86739ff9068f9106b4663389':
  Correctly forwarding the screen off event on lockscreen
 2014-09-03 15:34:23 +00:00
Santos Cordon
f4094e51c9 am 708a680e: Merge "Fix NPE in onDestroy." into lmp-dev 
* commit '708a680e630c452ff701203da69d69d8e674d4f1':
  Fix NPE in onDestroy.
 2014-09-03 15:34:19 +00:00
Winson Chung
67b4b2cdb4 Merge "Fixing Recents crash with non-primary user. (Bug 17343688)" into lmp-dev 2014-09-03 15:07:34 +00:00
Chet Haase
90ab047540 Merge "Fix behavior of inflating InsetDrawable" into lmp-dev 2014-09-03 14:55:30 +00:00
Jorim Jaggi
66a75e5e91 Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev 2014-09-03 14:50:31 +00:00
Selim Cinek
f6478d4c0a Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev 2014-09-03 14:49:22 +00:00
Santos Cordon
7632a807f7 Merge "Fix NPE in onDestroy." into lmp-dev 2014-09-03 14:48:37 +00:00
Jorim Jaggi
a0221f3a9f Improve subpixel rendering of battery icon on all densities 
Bug: 16161255
Change-Id: I97abc6a7a5cafb581e3f7c3d7509fdbf6d8542d5
 2014-09-03 16:37:06 +02:00
Youngsang Cho
dc6aa76193 am 797b2b0d: Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 
* commit '797b2b0de4246fabf9680babde907bd864cd639c':
  Add a warning log when it takes long time to handle a message in TIS
 2014-09-03 14:32:23 +00:00
George Mount
ae59476fa6 am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 14:32:18 +00:00
Youngsang Cho
6e31e0f3d1 Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 2014-09-03 14:24:39 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Youngsang Cho
9df2c1be32 Add a warning log when it takes long time to handle a message in TIS 
Bug: 17291092
Change-Id: If14ff467ac81d4f8d33febd57dd414dc5f4d3558
 2014-09-03 23:18:20 +09:00
Jason Monk
52c4f64666 am 46295dc1: Merge "Don\'t show add user for simple user switcher" into lmp-dev 
* commit '46295dc11a3224b39aa4ac87c49a21bd9c1126f4':
  Don't show add user for simple user switcher
 2014-09-03 14:16:21 +00:00
Jason Monk
cde8e8f91c Merge "Don't show add user for simple user switcher" into lmp-dev 2014-09-03 14:09:25 +00:00
Jason Monk
a73cbf8287 am 9df55f5e: Merge "Correct hotspot notification asset" into lmp-dev 
* commit '9df55f5e29729457b4364a2d761600da9de065a6':
  Correct hotspot notification asset
 2014-09-03 13:08:15 +00:00
Jason Monk
ab91856572 am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 
* commit '7023f0f25871c48d952f9c8cdd3985c04bb8d237':
  Enforce permissions on start/stopLockTaskModeOnCurrent
 2014-09-03 13:08:10 +00:00
Jorim Jaggi
db13a60f6e am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit '947de838385f3d0c271ff82d238ac58ba609acde':
  Status bar iconography updates
 2014-09-03 13:08:06 +00:00
Jason Monk
d4c2f3973c Merge "Correct hotspot notification asset" into lmp-dev 2014-09-03 12:59:44 +00:00
Jason Monk
cc1f2c08e3 Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 2014-09-03 12:59:35 +00:00
Jorim Jaggi
0c06d6bff1 Merge "Status bar iconography updates" into lmp-dev 2014-09-03 12:56:16 +00:00
Christoph Studer
fe5fe6431b am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 12:37:52 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Selim Cinek
7ff6eb6429 Correctly forwarding the screen off event on lockscreen 
Bug: 17364635
Change-Id: I88730238e3622522674268438d266fd2334410cd
 2014-09-03 14:18:09 +02:00
Sander Alewijnse
7628d171f5 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
 2014-09-03 11:55:01 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle. 
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
 2014-09-03 12:26:08 +01:00
Yohei Yukawa
5cde200201 am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
 2014-09-03 09:50:10 +00:00
Yohei Yukawa
851377f90c Merge "API Review: InputConnection" into lmp-dev 2014-09-03 09:41:48 +00:00
Lorenzo Colitti
dd2f20ef0b am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 06:36:49 +00:00
Lorenzo Colitti
e21b564168 Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev 2014-09-03 06:27:12 +00:00
Yohei Yukawa
d8636ea7ca API Review: InputConnection 
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
 2014-09-02 22:39:08 -07:00
Svetoslav
7d19901055 am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit '551335a38d0214e739571193369d6e476d9ff75b':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 03:23:07 +00:00
Svetoslav
f0e57e10ed Merge "Fix AccessibilityNode's isVisibleToUser behavior." into lmp-dev 2014-09-03 03:14:12 +00:00
Dianne Hackborn
2ca2f38f0a am d136d986: Add more slow execution logs. 
* commit 'd136d98634dc67c7caee4c96695acb47dd298710':
  Add more slow execution logs.
 2014-09-03 01:23:24 +00:00
Dianne Hackborn
f96a2854f2 am 8b88d87e: Merge "Revert "And yet more logging for slow execution."" into lmp-dev 
* commit '8b88d87eb707268fee63ccd5c33816e57cb5c952':
  Revert "And yet more logging for slow execution."
 2014-09-03 01:23:19 +00:00
Dianne Hackborn
a42c0de977 Add more slow execution logs. 
This time *without* mixing in an bunch of unintentional reverts!

Change-Id: Iab4cb9eb6d475d9fe5ebe16e9ea4be24c6f312e8
 2014-09-03 01:18:54 +00:00
Alan Viverette
aa9f10c305 am 37e5b8e4: Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 
* commit '37e5b8e458ae00db23799a8963fd075ddb105dd8':
  Use null instead of transparent for Material alert dialog sections
 2014-09-03 01:13:28 +00:00
Vinit Deshpande
c400ae685f am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '2705b859f86b9fdac374a55d24bcb47695b53e94':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 01:13:22 +00:00
Dianne Hackborn
39a59eb1af Merge "Revert "And yet more logging for slow execution."" into lmp-dev 2014-09-03 01:09:39 +00:00
Dianne Hackborn
1257e82b94 Revert "And yet more logging for slow execution." 
This reverts commit 113390ac113083884b6f498424b3f6afa2df4ebc.

Change-Id: I16fdb08f83ad31c10d943862bae639f622542339
 2014-09-03 01:09:21 +00:00
Alan Viverette
660ad761c3 Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 2014-09-03 01:02:18 +00:00
Vinit Deshpande
565f847038 Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 2014-09-03 00:59:28 +00:00
RoboErik
6225074d7c am d4c2499c: Merge "Allow empty strings in playFromSearch" into lmp-dev 
* commit 'd4c2499c4154b89e60f09947378e96d513a30a28':
  Allow empty strings in playFromSearch
 2014-09-03 00:49:59 +00:00
Alan Viverette
33ca60d4be am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit 'b975fe8793329ad3543b4d2462bf42db524ed161':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 00:49:55 +00:00
Alan Viverette
c340b23b48 am e03c6d1f: Merge "Don\'t clip preference row icons to padding" into lmp-dev 
* commit 'e03c6d1f32c3a45a83e4042dd70b73116e0d5301':
  Don't clip preference row icons to padding
 2014-09-03 00:49:49 +00:00
RoboErik
2bd7c2c569 am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* commit 'd5ceabd316bcd668f2b35f351f91ca8f242b32a6':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 00:49:45 +00:00