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

138439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
b0dced8173 Add an API to clear the device owner. 
Only the device owner will be able to clear itself.

Change-Id: Ie3231467d92e8c5d22ec51256177793f34110432
 2014-06-06 17:03:43 -04:00
Amith Yamasani
34e0888c99 am 87590b53: Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev 
* commit '87590b5342c5c4b1fb7b1c6037d64cffd1806025':
  Add missing abstract method override in BridgePowerManager.
 2014-06-06 20:57:52 +00:00
Dan Sandler
8c293fecaa am 8612d151: Merge "NoMan: Rank by \'when\' instead of \'postTime\'" into lmp-preview-dev 
* commit '8612d151b32e654daf4bb673ab93e402b56dd447':
  NoMan: Rank by 'when' instead of 'postTime'
 2014-06-06 20:57:47 +00:00
Jim Miller
525f5773e3 am 31499c15: (-s ours) Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev 
* commit '31499c15618c382b4a85bd2f022cf8b645dd86d5':
  Hide the fingerprint API for now. DO NOT MERGE
 2014-06-06 20:57:42 +00:00
Alan Viverette
6e083aeaad am 58248d04: Merge "Update drawables to fix CTS test failures" into lmp-preview-dev 
* commit '58248d049e8b17dd60e4e94e784c09b00e0a7e9d':
  Update drawables to fix CTS test failures
 2014-06-06 20:57:37 +00:00
Alan Viverette
f7807bf566 am fe0b773c: Make the action bar dark in DarkActionBar theme 
* commit 'fe0b773cd787b7326729d06d8e54c341f5cb12a6':
  Make the action bar dark in DarkActionBar theme
 2014-06-06 20:57:29 +00:00
Amith Yamasani
e7da1c5ee1 am dbfa4569: Fix build breakage in BatteryController 
* commit 'dbfa456927c2dd9d72a008a58fca6ffc29fc1481':
  Fix build breakage in BatteryController
 2014-06-06 20:57:18 +00:00
Jason Monk
f10606a9a4 Merge "Add device-owner based setting of global proxy." 2014-06-06 20:50:23 +00:00
Jason Monk
03bc991834 Add device-owner based setting of global proxy. 
Re-hide the setGlobalProxy on the ConnectivityManager as it requires
CONNECTIVITY_INTERNAL.  Instead add a function to the DevicePolicyManager
to set the global proxy, that can only be called by the device owner.

Change-Id: I9ffb2cc4f30a6dc9b868d86f056e1fbd512d8dfc
 2014-06-06 16:43:17 -04:00
Svetoslav
bb1b857841 Merge "Refactor printing" 2014-06-06 20:36:50 +00:00
Svetoslav
a798c0a984 Refactor printing 
Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
 2014-06-06 13:33:16 -07:00
Raph Levien
df8427c324 Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches" 2014-06-06 20:15:27 +00:00
Amith Yamasani
8a17910f81 Fix build breakage in BatteryController 
Caused due to a checkin race.

Change-Id: Icb636e4b2258064572b494ee5fcdd30538691d81
 2014-06-06 13:13:36 -07:00
Amith Yamasani
faecafce62 Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev 2014-06-06 19:59:06 +00:00
Ian Rogers
82649cf5a0 am 1f241f7e: (-s ours) am 74de10a0: (-s ours) am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit '1f241f7e16f7b363b0f0c3a9dc8e03e333e0852b':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:57:29 +00:00
Ian Rogers
1f241f7e16 am 74de10a0: (-s ours) am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit '74de10a0f232142b7a004ac6ca0fc94553796730':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:54:08 +00:00
Dan Sandler
2a03b2fa1f Merge "NoMan: Rank by 'when' instead of 'postTime'" into lmp-preview-dev 2014-06-06 19:44:40 +00:00
Ian Rogers
74de10a0f2 am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit 'd83ffe358db81abbde44ec38cd9121e67d25fbb3':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:42:12 +00:00
Jim Miller
a4b882f60c Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev 2014-06-06 19:40:43 +00:00
Alan Viverette
f2dc2d1459 Merge "Update drawables to fix CTS test failures" into lmp-preview-dev 2014-06-06 19:37:16 +00:00
Ian Rogers
d83ffe358d Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 2014-06-06 19:34:13 +00:00
Amith Yamasani
da8738fabd Add missing abstract method override in BridgePowerManager. 
Change-Id: I28a24f33f8a598e487ec21861e918a39a8875d43
 2014-06-06 12:28:27 -07:00
Alan Viverette
2987eefe09 Make the action bar dark in DarkActionBar theme 
Change-Id: I9f574bac1446fab88c0db1c7f9a45f50f73e3311
 2014-06-06 12:16:29 -07:00
Amith Yamasani
599176b616 Fix build breakage in BatteryController 
Caused due to a checkin race.

Change-Id: Icb636e4b2258064572b494ee5fcdd30538691d81
 2014-06-06 11:41:27 -07:00
Dianne Hackborn
d8883df650 am 87bc3c25: Merge "Improvements to low power mode." into lmp-preview-dev 
* commit '87bc3c258d8be516bc0fcedeb6eec34088582061':
  Improvements to low power mode.
 2014-06-06 18:26:17 +00:00
Selim Cinek
45ec647301 am b5de5c5e: Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev 
* commit 'b5de5c5eae5acf879314610a17c1c9950948782d':
  When dragging down on the lockscreen, the lowest card could jump.
 2014-06-06 18:25:58 +00:00
Dan Sandler
cb17c5e188 am e45ddb40: Merge "Always hide status bar icons when status bar is expanded" into lmp-preview-dev 
* commit 'e45ddb4008b3c217b59bc4ded61aea3caf2341eb':
  Always hide status bar icons when status bar is expanded
 2014-06-06 18:25:48 +00:00
Alan Viverette
06318a0869 Update drawables to fix CTS test failures 
Change-Id: I78617aedab450f5bc18807c03d07ee776584ece0
 2014-06-06 10:59:55 -07:00
Dianne Hackborn
421e2fd044 Merge "Improvements to low power mode." into lmp-preview-dev 2014-06-06 17:46:11 +00:00
Yorke Lee
67a0ed001d Merge "API changes to Telephony per API review" 2014-06-06 17:37:37 +00:00
Dianne Hackborn
eb94fa7975 Improvements to low power mode. 
Add new public API for monitoring low power mode.

BatteryService now puts device in to low power mode when
battery level is low.

Window manager now watches low power mode to turn off
animations.

Modifying the animator scale now gets propagated to all
processes.

Change-Id: I8fa566994764ddd4e1977631e28381ab9409f8ee
 2014-06-06 10:25:36 -07:00
Raph Levien
71f75f1e7b Merge "Fix getFontMetrics problems" 2014-06-06 17:10:32 +00:00
Raph Levien
817ef4ae79 Fix getFontMetrics problems 
Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
 2014-06-06 10:06:01 -07:00
Yorke Lee
282129fd3f API changes to Telephony per API review 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
 2014-06-06 09:29:32 -07:00
Selim Cinek
ece9de4466 Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev 2014-06-06 16:15:52 +00:00
Dan Sandler
52f9fc15a7 Merge "Always hide status bar icons when status bar is expanded" into lmp-preview-dev 2014-06-06 16:15:34 +00:00
Alexandra Gherghina
56e0d8003b Merge "Clean up deleted users in DevicePolicyManagerService" 2014-06-06 16:14:53 +00:00
Selim Cinek
aef92efb10 When dragging down on the lockscreen, the lowest card could jump. 
Bug: 15203895
Change-Id: I1a0a5a236490f12dba93700685be049d723b5339
 2014-06-06 18:06:04 +02:00
Jorim Jaggi
b13d36d428 Always hide status bar icons when status bar is expanded 
Also improve the animation when expanding/collapsing the shade for
a jank-free alpha fade animation.

Bug: 15448443
Bug: 15407838
Change-Id: Ieb0ce6d5bb1e5c1fb60d433b6989c52ec6924e8c
 2014-06-06 18:03:52 +02:00
Christoph Studer
52b7a5a597 NoMan: Rank by 'when' instead of 'postTime' 
Bug: 15461215
Change-Id: If17e2ff0a6e36ab45da07c2d883fcf8dc8025dc2
 2014-06-06 17:46:04 +02:00
George Mount
cb0462d36f am 2c9ce97c: Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 
* commit '2c9ce97c340393cb9fcb49d4163ab7d40f434186':
  API review: Constants to Gravity and Epicenter.
 2014-06-06 14:52:18 +00:00
John Reck
743922e9df Merge changes Ie0773f85,Ie5e75505 
* changes:
  Even FASTER damage calculations!
  Have all the setters return changed
 2014-06-06 14:41:37 +00:00
Florin Malita
53be7b79fb Merge "Implement SkCanvasGlue::clipRegion() using clipPath()." 2014-06-06 14:04:32 +00:00
George Mount
d23d509726 Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 2014-06-06 13:59:27 +00:00
Kenny Guy
262d905ee7 am b43f20d7: Merge "Badge notification from managed profiles." into lmp-preview-dev 
* commit 'b43f20d772e5d3b1beafac648ba39c27c33bea01':
  Badge notification from managed profiles.
 2014-06-06 12:36:28 +00:00
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
 2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
 2014-06-06 12:36:13 +00:00
Calin Juravle
c09722dc55 am c88a5ac3: am d1d46d9d: am bbf849b1: Merge "Add missing profiler options." 
* commit 'c88a5ac3ff0e3b3759c58279204bb8f6b8901669':
  Add missing profiler options.
 2014-06-06 12:31:24 +00:00
Calin Juravle
c88a5ac3ff am d1d46d9d: am bbf849b1: Merge "Add missing profiler options." 
* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
  Add missing profiler options.
 2014-06-06 12:28:17 +00:00
Calin Juravle
d1d46d9d55 am bbf849b1: Merge "Add missing profiler options." 
* commit 'bbf849b1c686c9e09c4d59574da70181a47ebb5d':
  Add missing profiler options.
 2014-06-06 12:09:48 +00:00