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

7675 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Winson Chung
e6a2068c27 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 
automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 00:37:10 +00:00
Winson Chung
0baa55a743 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-27 23:53:52 +00:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Jorim Jaggi
f53bc26f4e am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
automerge: 97f1a97

* commit '97f1a97d89366159374c2be3d74e0642705d80bf':
  Fix padding between battery and system icons
 2014-10-27 21:25:59 +00:00
Jorim Jaggi
7157ce9e94 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
automerge: 876820e

* commit '876820eb670936815e9064f816a8ce14bda64455':
  Fix system icon widths
 2014-10-27 21:24:41 +00:00
Jorim Jaggi
05e7c26b0d am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
automerge: 286f361

* commit '286f36112e424a173a5a57f881545045c54ec76b':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 21:23:43 +00:00
Jorim Jaggi
97f1a97d89 am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
* commit 'f129ee377ab2771a5159fde9208da8c26207d41b':
  Fix padding between battery and system icons
 2014-10-27 20:36:20 +00:00
Jorim Jaggi
876820eb67 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
* commit '9016d8fa80d1f3d17c612fdc7edcfabb70b1c29e':
  Fix system icon widths
 2014-10-27 20:36:16 +00:00
Jorim Jaggi
286f36112e am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
* commit '312c1e79d49a1ce7f7202f3bedb3a8d1fa110e4d':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 20:36:10 +00:00
winsonchung
f14fdda212 Fixing potential crash when the task loader is stopped. (Bug 18135583) 
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
 2014-10-27 12:08:54 -07:00
Adrian Roos
fa81d2126a Fix NPE in FlashlightController 
Bug: 18007548
Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe
 2014-10-27 16:57:43 +01:00
Geoff Mendal
496f0ea68a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-27 15:50:38 +00:00
Geoff Mendal
935bc33693 Import translations. DO NOT MERGE 
Change-Id: Iff4ddd0201aae07d5a847087ba53cd50aa1ba5c3
Auto-generated-cl: translation import
 2014-10-27 08:48:48 -07:00
Geoff Mendal
592931437c Import translations. DO NOT MERGE 
Change-Id: I05a75d27b0c7752e6afc0d51169e82f7547607df
Auto-generated-cl: translation import
 2014-10-27 08:47:13 -07:00
Jorim Jaggi
f129ee377a Merge "Fix padding between battery and system icons" into lmp-mr1-dev 2014-10-27 14:32:15 +00:00
Jorim Jaggi
9016d8fa80 Merge "Fix system icon widths" into lmp-mr1-dev 2014-10-27 14:31:54 +00:00
Jorim Jaggi
312c1e79d4 Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 2014-10-27 14:31:33 +00:00
Adrian Roos
b9ae09066c Fix stale unlock icon 
Bug: 17405104
Change-Id: I2076c5008fc3617b8a0da5f547bbdca27ce875f4
 2014-10-27 14:20:30 +01:00
Winson Chung
df56c759a4 am 56f77a6f: Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev automerge: 0841cf7 
* commit '56f77a6f535a38ccd0bbe359ffd0be766bcc1d51':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
 2014-10-24 23:03:30 +00:00
Winson Chung
56f77a6f53 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev 
automerge: 0841cf7

* commit '0841cf7f37d7b20a08fa894c366f32fde55ea7e9':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
 2014-10-24 22:25:31 +00:00
Winson Chung
0841cf7f37 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev 2014-10-24 22:08:12 +00:00
Winson Chung
14dd733073 am 00f65038: am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 
* commit '00f65038bbbfd0227bb544040e0f06038016a7b4':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
 2014-10-24 18:44:22 +00:00
Winson Chung
00f65038bb am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 
* commit '272b0a1d6acdb7c4d244a498f3769e20c35f43d1':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
 2014-10-24 18:39:28 +00:00
Winson Chung
7f8d8cc6a2 am e60abbd8: am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 
* commit 'e60abbd8f2e8d54f0a04944c11f2f752f8a206e2':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
 2014-10-24 18:34:47 +00:00
Winson Chung
b645ac5fc4 am 788dd73c: am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 
* commit '788dd73c9e96f77370f8a787d3c25c8ff741de64':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
 2014-10-24 18:34:36 +00:00
Winson Chung
272b0a1d6a Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 2014-10-24 18:32:02 +00:00
Winson Chung
e60abbd8f2 am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 
* commit '623484d231436ee209089adaa6b88b68f0ebf534':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
 2014-10-24 18:30:38 +00:00
Winson Chung
788dd73c9e am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 
* commit '6697322af724d44ee59259d4f5563b07c24f62b4':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
 2014-10-24 18:30:33 +00:00
Winson Chung
bac679b0d4 Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321) 
Change-Id: I7fc627c79fe369e444ab411d109c439f796d67ff
 2014-10-24 11:29:12 -07:00
Winson Chung
623484d231 Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 2014-10-24 18:25:10 +00:00
Winson Chung
6697322af7 Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 2014-10-24 18:24:54 +00:00
Selim Cinek
edac8c895a am 31e307e6: am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 
* commit '31e307e6009c6461c8abc06a25d1be834e11d2a5':
  Cleaned up status bar closing handling
 2014-10-24 16:52:39 +00:00
Selim Cinek
31e307e600 am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 
* commit '1b459f89a738fa913ed12fe893e435b2f6cc9416':
  Cleaned up status bar closing handling
 2014-10-24 16:48:21 +00:00
Selim Cinek
1b459f89a7 Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 2014-10-24 16:41:19 +00:00
Selim Cinek
dbbcfbe8ae Cleaned up status bar closing handling 
This could lead to a bug where there was a hole in the shade.

Bug: 17961295
Change-Id: Ief4bb3f79433a062c4904329e7ca130987d7fe0f
 2014-10-24 17:52:35 +02:00
Christoph Studer
438238eefa am 629a9a0b: am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 
* commit '629a9a0b392026169287fde5d168593fa228ec55':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
 2014-10-24 15:26:03 +00:00
Christoph Studer
629a9a0b39 am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 
* commit '6709fba99e76480ae2728a7832c0c9796a11658a':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
 2014-10-24 15:20:40 +00:00
Christoph Studer
6709fba99e Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 2014-10-24 15:15:03 +00:00
Selim Cinek
1aa2876c37 am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 
* commit '962c5ab8490c268ec55feff98466fab654116ea1':
  Fixed a bug where the indication text could get too high
 2014-10-24 15:08:22 +00:00
Selim Cinek
962c5ab849 am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 
* commit '2985dd763b21c63f54ef3d5f26cae249480ea05a':
  Fixed a bug where the indication text could get too high
 2014-10-24 15:03:06 +00:00