Chris Wren
91807556a8
Merge "Allow longer translations in the notification actions." into lmp-dev
2014-09-25 19:50:33 +00:00
Amith Yamasani
bd5ccc1b03
am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
...
* commit '158c51f3b84f8870d562e12fcd6b1ba672348fd9':
Fix GPS icon not showing for secondary users
2014-09-25 19:40:54 +00:00
John Spurlock
bc4f9b2c34
am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
...
* commit '37c874d0826dfe0142a317b4d7e0e0bf7b53ec17':
Supertoast when user changes zen mode.
2014-09-25 19:33:12 +00:00
Amith Yamasani
5ae520ce7d
am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
...
* commit '95548b395d681b0ecfef341058f282f624ae3862':
Fix GPS icon not showing for secondary users
2014-09-25 19:29:36 +00:00
John Spurlock
3df5327b96
am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
...
* commit '0dccf597f10fd0dc755f42514c470d447c820b20':
Supertoast when user changes zen mode.
2014-09-25 19:19:45 +00:00
Amith Yamasani
91dcf1f93c
Merge "Fix GPS icon not showing for secondary users" into lmp-dev
2014-09-25 19:18:24 +00:00
John Spurlock
27c7b9295d
Supertoast when user changes zen mode.
...
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.
Also fix a recent regression in the zen subhead alignment.
Bug:16215680
Bug:17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
2014-09-25 15:04:32 -04:00
Chris Wren
0eba732e36
Allow longer translations in the notification actions.
...
Bug: 17345743
Change-Id: Icd0588516cb568ea76e2766f54ba1a61a8f3d997
2014-09-25 13:38:39 -04:00
Amith Yamasani
84949f5c4b
Fix GPS icon not showing for secondary users
...
Watch for high power usage broadcasts from all users in the statusbar.
Bug: 17647654
Change-Id: I2c6c5a218d38438415a450cfa2f9328763af3f50
2014-09-24 17:46:19 -07:00
Selim Cinek
2a8fef96d8
am 31b8ed21: am c23d37aa: am 31dc5801: Only show FAB for the frontmost task
...
* commit '31b8ed21c78344587be114669a91095fbd838fa7':
Only show FAB for the frontmost task
2014-09-24 23:02:43 +00:00
Selim Cinek
40f6384b64
am c23d37aa: am 31dc5801: Only show FAB for the frontmost task
...
* commit 'c23d37aae690001d7f5fd82c9db80fd01876e079':
Only show FAB for the frontmost task
2014-09-24 22:53:56 +00:00
Selim Cinek
104aae1dcc
Only show FAB for the frontmost task
...
Bug: 17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
2014-09-24 22:05:59 +00:00
Baligh Uddin
4149138abf
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-24 17:49:37 +00:00
Baligh Uddin
e9cc776346
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-09-24 17:49:25 +00:00
Baligh Uddin
da1e729297
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-24 17:49:14 +00:00
Baligh Uddin
7f1e70b48d
Merge "Import translations. DO NOT MERGE"
2014-09-24 17:49:13 +00:00
Adrian Roos
158f63a620
am 00d00375: am f3cd66e1: am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit '00d00375653d2ade24678ba42cdd48aec0aeab5e':
Fix ColorInversionTile for secondary users
2014-09-24 17:36:45 +00:00
Adrian Roos
bb25830886
am f3cd66e1: am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit 'f3cd66e11359885980c6f2a16f6e0705bbdf5500':
Fix ColorInversionTile for secondary users
2014-09-24 17:30:17 +00:00
Jason Monk
9d9a5d6059
am 822e1758: am 52a03e34: am b5703c37: am e0000160: am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit '822e1758c9984923a868c033b37c643b7b7a21a8':
Fix accessibility announcement for QS details
2014-09-24 17:18:46 +00:00
Adrian Roos
500d0714e9
am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit '291d6e0f59f479b8d451293e72a7a834a8cf375d':
Fix ColorInversionTile for secondary users
2014-09-24 16:59:10 +00:00
Adrian Roos
895db8525b
Merge "Fix ColorInversionTile for secondary users" into lmp-dev
2014-09-24 16:46:21 +00:00
Jason Monk
7fec638e35
am 52a03e34: am b5703c37: am e0000160: am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit '52a03e34abd08e55b08c745a32e9a8afbeebebd5':
Fix accessibility announcement for QS details
2014-09-24 16:20:28 +00:00
Adrian Roos
32d88e8ead
Fix ColorInversionTile for secondary users
...
Bug: 17626692
Change-Id: I40354a460a7c00f6fd5eb05f7836dc89129fdacb
2014-09-24 17:08:22 +02:00
Jason Monk
f672628231
am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit 'c631f9629ed936094352a7a2b8f23af3749f3bb6':
Fix accessibility announcement for QS details
2014-09-24 14:59:57 +00:00
Jason Monk
8681c044be
Merge "Fix accessibility announcement for QS details" into lmp-dev
2014-09-24 14:50:04 +00:00
Jason Monk
a30fcc2fef
am 0b32f2cd: am 65149ac3: am e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev
...
* commit '0b32f2cd2b48ec4c2f66869ec6062365fb74dbd7':
Add missing permission for hotspot QS tile
2014-09-23 20:57:21 +00:00
Selim Cinek
715d1694b8
am 2a03e3e0: am 1817e501: am 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
...
* commit '2a03e3e031e716c606b6e034997f6cefbd07e549':
Enforcing falsing-threshold on touch when using AoD
2014-09-23 20:57:14 +00:00
Christoph Studer
0c07268aa4
am d894e9b8: am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
...
* commit 'd894e9b8d0aeccaf14c52152bffc87d43ce5bd83':
SysUI: Correctly compare MediaControllers
2014-09-23 20:55:48 +00:00
Jason Monk
2186efeb91
am 65149ac3: am e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev
...
* commit '65149ac32a3f11b7ffcbad625664ed17b7f8a4d8':
Add missing permission for hotspot QS tile
2014-09-23 20:26:17 +00:00
Selim Cinek
d5cc15014d
am 1817e501: am 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
...
* commit '1817e501f12440d8447f3168c9dfe6a6a280360c':
Enforcing falsing-threshold on touch when using AoD
2014-09-23 20:08:58 +00:00
Jason Monk
f54df1d84b
am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev
...
* commit 'da75ab99f1c77448cba0fb1bb45ac33a17b54532':
Add missing permission for hotspot QS tile
2014-09-23 19:51:27 +00:00
Jason Monk
56ac947b69
Merge "Add missing permission for hotspot QS tile" into lmp-dev
2014-09-23 19:42:25 +00:00
Selim Cinek
fb88717ecb
am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
...
* commit '69d53b0ee95c7b27223d12a67bbf653b3b8c9004':
Enforcing falsing-threshold on touch when using AoD
2014-09-23 19:34:28 +00:00
Selim Cinek
59ca78c937
Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
2014-09-23 19:28:13 +00:00
Jeff Brown
bd369f4a58
am f45e4d55: am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
...
* commit 'f45e4d5535d1540c99b944e244e2720436d369f2':
Ensure wakelock is released unconditionally.
2014-09-23 19:08:13 +00:00
Selim Cinek
29ed3c92ef
Enforcing falsing-threshold on touch when using AoD
...
Also increased the threshold by a factor of 1.5 if
we are waking up due to a touch.
Bug: 17350239
Change-Id: Ida8bad234b3815abf80ca57f8004f3bc5df003cd
2014-09-23 20:44:35 +02:00
Christoph Studer
ccc3f012b0
am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
...
* commit 'b83d9dc3e1d853d43807375d79d90739e572b938':
SysUI: Correctly compare MediaControllers
2014-09-23 17:48:30 +00:00
Jeff Brown
3f0afd3544
am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
...
* commit 'c7b28e741062e197644f2c2f29b55a75b4ccb39e':
Ensure wakelock is released unconditionally.
2014-09-23 17:22:59 +00:00
Christoph Studer
8d843cea30
am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
...
* commit '5a7068eec454df33575176d9f4ee58de577a6401':
SysUI: Correctly compare MediaControllers
2014-09-23 17:11:30 +00:00
Christoph Studer
231dc0a6d2
Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
2014-09-23 17:03:48 +00:00
Jeff Brown
47b32c569a
am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
...
* commit '28c9590b90215230b65d98c4d816e0d776a07540':
Ensure wakelock is released unconditionally.
2014-09-23 16:48:40 +00:00
Jeff Brown
510e8cdc8d
Merge "Ensure wakelock is released unconditionally." into lmp-dev
2014-09-23 16:39:40 +00:00
Jeff Brown
a273924b8c
Ensure wakelock is released unconditionally.
...
Bug: 17610254
Change-Id: I8b846c867edaa5038e34d4c857550735b121a1d9
2014-09-23 09:38:04 -07:00
Selim Cinek
be14f2453a
am 91be004d: am 51bc3416: am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev
...
* commit '91be004d3b6ea0064ec2cf9f8ab7170ea7c8c991':
Fixed a bug where the alarm could overlap in QS
2014-09-23 16:22:35 +00:00
Adrian Roos
b8682f91a6
am cc9f57df: am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev
...
* commit 'cc9f57df925a80a22d5cf666851937e75bdc2ffc':
Ensure that force lock works with accessibility enabled
2014-09-23 16:22:30 +00:00
John Spurlock
2389580424
am ac96ebf0: am 59c9166f: am 024849b2: am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit 'ac96ebf070bb3cb3afc0c6458997ac5d962fcbdf':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-23 16:19:13 +00:00
John Spurlock
c80405ab5c
am de53e072: am 78de9759: am 2af1bf3b: am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit 'de53e07222a90bcbd786fec226ee01bc70f879e4':
Zen: Add content description to settings icon.
2014-09-23 16:19:08 +00:00
Jason Monk
bd42abc6c9
am e14c561f: am 185f34b5: am 1555ed94: am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev
...
* commit 'e14c561f96438353518e964568fd5cb135ff2228':
Announce title of QS detail views
2014-09-23 16:16:38 +00:00
Jason Monk
928a74de07
am 66748e95: am e88e8e85: am 78f7385f: am f09fda20: am f9d996c1: Fix status bar cast icon not updating
...
* commit '66748e95289f5b466c51c0e5116ba0ecfe4ee9e1':
Fix status bar cast icon not updating
2014-09-23 16:16:33 +00:00
John Spurlock
9702192319
am e47f03c1: am 34dfd6bb: am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev
...
* commit 'e47f03c1d0b18c915344315e4dc172b834ac33bd':
Doze: Ensure a doze reset happens after leaving keyguard.
2014-09-23 16:16:23 +00:00