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

8316 Commits

Author SHA1 Message Date
Adrian Roos
c9bfda6079 am f3aadaf5: am ca6e3879: am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit 'f3aadaf5ddf6df202d81031f0e76457c03b6149d':
  Close keyguard user switcher on tap outside
 2014-10-30 10:26:39 +00:00
Adrian Roos
f3aadaf5dd am ca6e3879: am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit 'ca6e38792d9b001dc404cfa83808aec88369c822':
  Close keyguard user switcher on tap outside
 2014-10-30 10:18:33 +00:00
Elliott Hughes
64a1a901dc am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:13:38 +00:00
Geoff Mendal
2ab65ff448 Import translations. DO NOT MERGE 
Change-Id: I8f1bf8edcb728903664ca201fbf1ed6e7e31e9eb
Auto-generated-cl: translation import
 2014-10-29 08:51:47 -07:00
Adrian Roos
ca6e38792d am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit '579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a':
  Close keyguard user switcher on tap outside
 2014-10-28 20:31:12 +00:00
Adrian Roos
579a7f9940 Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 2014-10-28 20:27:41 +00:00
Jason Monk
c15fe797e1 am 09f3b9ea: Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev automerge: 8c01dfc automerge: caed5a2 
* commit '09f3b9eaeb5e16c7594803f8aec7ce16027095ad':
  QS: Bring back BT/Wi-Fi sub-panels
 2014-10-28 19:44:36 +00:00
Jason Monk
e40e1299d1 am 40679845: Merge "Add hotspot icon to status bar" into lmp-mr1-dev automerge: 09895be automerge: dda6193 
* commit '4067984551eec0e7816f7c5120e7fd1154cfa364':
  Add hotspot icon to status bar
 2014-10-28 19:44:32 +00:00
Jason Monk
09f3b9eaeb Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev automerge: 8c01dfc 
automerge: caed5a2

* commit 'caed5a29760ac1a32a0248e518b71d2d6df3d33e':
  QS: Bring back BT/Wi-Fi sub-panels
 2014-10-28 19:41:21 +00:00
Jason Monk
4067984551 Merge "Add hotspot icon to status bar" into lmp-mr1-dev automerge: 09895be 
automerge: dda6193

* commit 'dda619395bc0186b64d6512dae1b422346471158':
  Add hotspot icon to status bar
 2014-10-28 19:40:06 +00:00
Jason Monk
caed5a2976 Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev 
automerge: 8c01dfc

* commit '8c01dfc5af599398c1c79f87619c302e000e3353':
  QS: Bring back BT/Wi-Fi sub-panels
 2014-10-28 19:16:44 +00:00
Jason Monk
dda619395b Merge "Add hotspot icon to status bar" into lmp-mr1-dev 
automerge: 09895be

* commit '09895be87e327a7e2090c88cb4a5fc997f33103c':
  Add hotspot icon to status bar
 2014-10-28 19:15:45 +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
Jason Monk
8c01dfc5af Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev 2014-10-28 18:45:34 +00:00
Jason Monk
09895be87e Merge "Add hotspot icon to status bar" into lmp-mr1-dev 2014-10-28 18:27:06 +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
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
Jason Monk
5d325074b1 QS: Bring back BT/Wi-Fi sub-panels 
Bluetooth has stayed pretty much the same, just came back.

Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.

Bug: 17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
 2014-10-28 13:43:04 -04: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
Adrian Roos
2d1ef3012c Close keyguard user switcher on tap outside 
Also closes when tapping the current user.
Also fixes a bug, where the background alpha was
not properly initialized. And while we're at it,
fixes a bug where the user switcher was closable
in simple mode by extending quick settings.

Bug: 17691134
Change-Id: I5444fe42a8a2887ab012ef6cbdcc57ba81a8c1c2
 2014-10-28 17:46:03 +01: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
Jason Monk
952d5d8d8a Add hotspot icon to status bar 
Bug: 17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
 2014-10-28 09:31:42 -04:00
Winson Chung
170b31a45e am e6a2068c: Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 automerge: 0baa55a 
* commit 'e6a2068c2780a040fb0a72820a132ad0578deb1e':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 07:17:13 +00:00
Jorim Jaggi
019390f6f5 am f53bc26f: am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev automerge: 97f1a97 
* commit 'f53bc26f4ef2bf4e2ea122f9a7dd2471ca6f83e0':
  Fix padding between battery and system icons
 2014-10-28 07:15:51 +00:00
Jorim Jaggi
f61a71b92b am 7157ce9e: am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev automerge: 876820e 
* commit '7157ce9e94d7198e9604f8a9c1324290f1ef1bae':
  Fix system icon widths
 2014-10-28 07:15:46 +00:00
Jorim Jaggi
d866ef6cc1 am 05e7c26b: am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev automerge: 286f361 
* commit '05e7c26b0d0aa0799615d2dd69beadb2af1a6637':
  Add padding when both data icon and wifi icon is visible
 2014-10-28 07:15:42 +00:00
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +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
Geoff Mendal
cd32bbde4f Import translations. DO NOT MERGE 
Change-Id: I77c9dc6c7bcb23b3e35affb3317ecca84c385d51
Auto-generated-cl: translation import
 2014-10-27 09:01:40 -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