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

170500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
6d2268420d am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev automerge: 06caf1b 
* commit 'd75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 19:06:00 +00:00
John Spurlock
a949dc659d am d856afec: am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev automerge: 93e40ba 
* commit 'd856afec47c069fe117cdf6c3e22c3d066565a11':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 19:05:55 +00:00
George Mount
830593ee70 am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb 
* commit 'aeb0a9dba297a027344bc91e8b9e33c84c450876':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 19:05:50 +00:00
George Mount
7883be77e5 am c1423972: am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev automerge: 69a3dd8 
* commit 'c1423972727f59a02ca1bc3e55f694e9a27b82d5':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 19:05:47 +00:00
Nicolas Prevot
755c098042 am ecdc14dc: am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev automerge: e86848c 
* commit 'ecdc14dc31ba22f2569be5c8850d0d09a1a0c0a4':
  Replace minimum with maximum in method description.
 2014-10-28 18:15:59 +00:00
Benjamin Franz
f481d6a48f am 22fd4e36: am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev automerge: 5852369 
* commit '22fd4e36b859f7a3b4d5ea6e991effb71713e8cc':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 18:15:55 +00:00
Jorim Jaggi
c898713289 am dc9f9420: am 4eedc1d9: Fix jank when launching something from lockscreen automerge: 76dfffe 
* commit 'dc9f94200352ce3e4e890c6d7eb22bbd9a3511f8':
  Fix jank when launching something from lockscreen
 2014-10-28 18:11:12 +00:00
Adrian Roos
176afe1f96 am 37a9f82f: am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev automerge: 4a915ab 
* commit '37a9f82ffe0536c2da24e30c3c321854752b1741':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 18:11:08 +00:00
Adrian Roos
254a194049 am 732f4f72: am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev automerge: 98a8258 
* commit '732f4f72b5a284d86a409428d555f1a3f982d4c8':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 18:11:04 +00:00
Craig Mautner
6a02e15d59 am 6ba2ec8f: am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev automerge: 2381825 
* commit '6ba2ec8f93ba5cc530f448fd7f09d515cebff0e0':
  Do not go through a layout if visibility is GONE
 2014-10-28 18:10:59 +00:00
Adam Lesinski
d75d3eb5e4 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
automerge: 06caf1b

* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 18:09:20 +00:00
John Spurlock
d856afec47 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 
automerge: 93e40ba

* commit '93e40ba6c4373402c7c4f430e3e575e4a0cc13eb':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 18:08:11 +00:00
George Mount
aeb0a9dba2 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
automerge: 8a536bb

* commit '8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 18:06:58 +00:00
George Mount
c142397272 am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
automerge: 69a3dd8

* commit '69a3dd85df49d5c5ef67d7c28f1473d23ce46980':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 18:06:04 +00:00
Nicolas Prevot
ecdc14dc31 am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 
automerge: e86848c

* commit 'e86848c258a2fc42e52eb1e3234c1288acd96a3b':
  Replace minimum with maximum in method description.
 2014-10-28 18:05:09 +00:00
Benjamin Franz
22fd4e36b8 am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 
automerge: 5852369

* commit '58523698080af9bd9df49b22a591e1db9f39bf25':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 18:04:15 +00:00
Jorim Jaggi
dc9f942003 am 4eedc1d9: Fix jank when launching something from lockscreen 
automerge: 76dfffe

* commit '76dfffeb9f25e5106ae6521b80947d0a10f7e3d1':
  Fix jank when launching something from lockscreen
 2014-10-28 18:03:23 +00:00
Adrian Roos
37a9f82ffe am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
automerge: 4a915ab

* commit '4a915ab505b4a39dab9ab99020bcae57e90ff928':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 18:02:27 +00:00
Adrian Roos
732f4f72b5 am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 
automerge: 98a8258

* commit '98a8258dd8759722b3aedce9297023291e33d724':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 18:01:18 +00:00
Craig Mautner
6ba2ec8f93 am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 
automerge: 2381825

* commit '2381825db49718891e345eebe34b58644beab10d':
  Do not go through a layout if visibility is GONE
 2014-10-28 17:59:39 +00:00
Adam Lesinski
06caf1b111 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
* commit '31b76b66b1678eb6483676aa2ef587e10b98d02a':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 17:45:13 +00:00
Adam Lesinski
31b76b66b1 Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 2014-10-28 17:41:12 +00:00
John Spurlock
93e40ba6c4 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 
* commit 'ee990413b51b41e4fe8940cba703bdfb56a12018':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 17:17:03 +00:00
John Spurlock
ee990413b5 Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 2014-10-28 17:08:43 +00:00
George Mount
8a536bb4e0 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
* commit '95d520f160db65f90da56610eee1a047fb60fc4e':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 17:04:33 +00:00
George Mount
69a3dd85df am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
* commit '45b701085b8507006c07f5eb86d9f29f4ee07457':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 17:04:28 +00:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
John Spurlock
c90e6fe863 Zen: Show "(until 4:56 PM)" in exit conditions. 
Implement two-line exit conditions, display the duration + end
time on separate lines.

Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
 2014-10-28 12:57:43 -04:00
Nicolas Prevot
e86848c258 am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 
* commit 'ebee8a4d92a8e80b49feb51e9c9621c79398457c':
  Replace minimum with maximum in method description.
 2014-10-28 16:44:47 +00:00
Benjamin Franz
5852369808 am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 
* commit 'f5c00c1c1136c9752b9c0157f9eca6385d7b9448':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 16:44:42 +00:00
Jorim Jaggi
76dfffeb9f am 4eedc1d9: Fix jank when launching something from lockscreen 
* commit '4eedc1d97e5aa3bfaa60af9894cd991f9e210fc2':
  Fix jank when launching something from lockscreen
 2014-10-28 16:44:36 +00:00
Adrian Roos
4a915ab505 am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 16:44:31 +00:00
Nicolas Prevot
ebee8a4d92 Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 2014-10-28 16:33:33 +00:00
Nicolas Prevot
555f1986f1 Replace minimum with maximum in method description. 
BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
 2014-10-28 16:18:47 +00:00
Benjamin Franz
f5c00c1c11 Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 2014-10-28 16:13:05 +00:00
Jorim Jaggi
4eedc1d97e Fix jank when launching something from lockscreen 
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.

Bug: 18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
 2014-10-28 16:12:08 +00:00
Adrian Roos
288f65e381 Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 15:23:14 +00:00
Adrian Roos
98a8258dd8 am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 
* commit 'bd6f4a818ef36764eb69ef7308eb6a9bf3740138':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 14:44:28 +00:00
Adrian Roos
bd6f4a818e Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 2014-10-28 14:37:39 +00:00
Craig Mautner
2381825db4 am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 
* commit '74fe6ce72dcbc7af501022e7617528c30a0983bb':
  Do not go through a layout if visibility is GONE
 2014-10-28 14:00:54 +00:00
Craig Mautner
74fe6ce72d Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 2014-10-28 13:56:09 +00:00
Christoph Studer
706e2b71ff am c1d93cf4: Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 6857203 automerge: 3fc8118 
* commit 'c1d93cf4dcb0e406e952d635db4a6209261c915d':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 13:02:37 +00:00
Christoph Studer
c1d93cf4dc Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 6857203 
automerge: 3fc8118

* commit '3fc811803db5f534399697dab1994e19af2a95f3':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 12:57:50 +00:00
Christoph Studer
3fc811803d Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 
automerge: 6857203

* commit '685720309a582acc513454d674f82368479c5297':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 12:45:50 +00:00
Christoph Studer
685720309a Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 2014-10-28 12:41:33 +00:00
Ari Sachter-Zeltzer
6f2c05722f am 0b695be1: am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev automerge: 35bedd1 
* commit '0b695be1790ac9a1f2f933ee22195b41084581fc':
  fixed jank on activity close exit with better alpha interpolation
 2014-10-28 09:55:49 +00:00
Ari Sachter-Zeltzer
0b695be179 am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 
automerge: 35bedd1

* commit '35bedd19d4b8a1b902be38bc4765de29376df9e4':
  fixed jank on activity close exit with better alpha interpolation
 2014-10-28 09:48:40 +00:00
Ari Sachter-Zeltzer
35bedd19d4 am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 
* commit '20edd0532738e9df72da0a9b6d39d541b9cb1ca9':
  fixed jank on activity close exit with better alpha interpolation
 2014-10-28 09:01:39 +00:00
Erik Kline
ecb2397c33 am e9810e8d: Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 automerge: 8fc600d 
* commit 'e9810e8d532d87d23d3824d6165824a2da0cfee9':
  (re)define the definition of "provisioned"
 2014-10-28 09:00:20 +00:00