John Spurlock
c3b52b0bf6
am af1f2882: am e22aa0f8: am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev
...
* commit 'af1f28823b92d15d0d31d02e6fe91ffb42bdc201':
StatusBar: Allow roaming indicator even when also on wifi.
2014-08-28 20:23:14 +00:00
John Spurlock
e4bb6b324b
am e22aa0f8: am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev
...
* commit 'e22aa0f8ddb69d845513d086846cf2ae57b793b5':
StatusBar: Allow roaming indicator even when also on wifi.
2014-08-28 20:10:41 +00:00
Julia Reynolds
5fd5d461d2
am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
...
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
Audio/Micrphone user restriction/multiuser updates.
2014-08-28 20:10:38 +00:00
Julia Reynolds
9130ae4501
am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
...
* commit 'fa39108f4a59e96915d9efbddd2548d49611745d':
Audio/Micrphone user restriction/multiuser updates.
2014-08-28 20:01:16 +00:00
John Spurlock
b581c097e6
am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev
...
* commit '6b7a237ea55548689664c589b1bb5a205e7538a6':
StatusBar: Allow roaming indicator even when also on wifi.
2014-08-28 19:58:56 +00:00
Winson Chung
dd014e73bf
am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
...
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
2014-08-28 19:51:08 +00:00
Julia Reynolds
abe3347950
am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
...
* commit 'd266bd44dcf79b14584a3af223d78fe80c4d571a':
Audio/Micrphone user restriction/multiuser updates.
2014-08-28 19:46:08 +00:00
John Spurlock
1a3febe711
Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev
2014-08-28 19:45:53 +00:00
Julia Reynolds
a8528c6420
Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
2014-08-28 19:41:42 +00:00
John Spurlock
14339c9edc
StatusBar: Allow roaming indicator even when also on wifi.
...
Bug:14610152
Change-Id: Ia83abe0ae862ed747ee280c61c2fff3b62345b41
2014-08-28 15:41:29 -04:00
Winson Chung
19042f10fa
am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
...
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
2014-08-28 19:38:45 +00:00
Winson Chung
c1520475cd
am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
...
* commit '62354353bfee37bc6ea1316f8a521a68131c989c':
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
2014-08-28 19:26:29 +00:00
Winson Chung
8bd5d69008
Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
2014-08-28 19:15:10 +00:00
John Spurlock
2ce182384a
am 89649d1b: am da347330: am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev
...
* commit '89649d1bd764d9cf884a16786b1565eb171a01cc':
QS: Don't collapse the panel when turning location on.
2014-08-28 19:07:30 +00:00
John Spurlock
8bcb0bad5c
am da347330: am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev
...
* commit 'da34733065190feba7db6db43dc1714f95f7c15b':
QS: Don't collapse the panel when turning location on.
2014-08-28 18:54:35 +00:00
Alan Viverette
3e53d52a9f
am 6ddb2467: am 8a319757: am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev
...
* commit '6ddb2467b46a1c32a738a2082800cc9c19e9c053':
Rename StatusBar.Material styles to Material.Notification
2014-08-28 18:43:29 +00:00
John Spurlock
764173c1fd
am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev
...
* commit '682806ceafad1389ac78e3df7d39a48ca739af7d':
QS: Don't collapse the panel when turning location on.
2014-08-28 18:40:38 +00:00
John Spurlock
832d351ca5
Merge "QS: Don't collapse the panel when turning location on." into lmp-dev
2014-08-28 18:30:29 +00:00
Alan Viverette
5f0d931d05
am 8a319757: am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev
...
* commit '8a3197576e89643df760357032ab847c3433342f':
Rename StatusBar.Material styles to Material.Notification
2014-08-28 18:27:52 +00:00
John Spurlock
d21df6076f
QS: Don't collapse the panel when turning location on.
...
Bug:17127158
Change-Id: Ide92c2bd134a84dea796a62710a9016a679b0b74
2014-08-28 14:25:05 -04:00
Alan Viverette
e454802769
am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev
...
* commit 'a5a9c6e03b11d502c0b1e845611aad0171e51d9f':
Rename StatusBar.Material styles to Material.Notification
2014-08-28 18:15:55 +00:00
Alan Viverette
b712458362
Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev
2014-08-28 18:13:21 +00:00
Winson Chung
48a10a56e9
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
...
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change
Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
2014-08-28 10:23:40 -07:00
Kenny Guy
1aca0dd73b
Load ApplicationInfo for correct user.
...
Use package manager for the user that the
notification is built for so it can load
ApplicationInfos for packages installed
in secondard uses but not primary user.
Bug: 17313228
Change-Id: I1b9fa031676e3ba77047c88ae2c2b37a2a38dbb2
2014-08-28 15:54:10 +01:00
Selim Cinek
4f82ee6d47
am f7454985: am 3ec368c1: am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit 'f7454985dfaaef12bb1b6617d15664ef2b082f50':
Fixed a flash of the preview image when going to the dialer
2014-08-28 14:02:01 +00:00
Selim Cinek
a2fd95138b
am 5f087df0: am 9f1a9f49: am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit '5f087df0a18eb9af0acbe6d5cd0b893d23562980':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 14:01:57 +00:00
John Spurlock
79b873ae90
am 0ab9ce87: am 9736f6a4: am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '0ab9ce87f86dc28b4670b4e2a18fd7463f4379d2':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 14:01:52 +00:00
Selim Cinek
bef1942fab
am 06585ecf: am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner
...
* commit '06585ecfc7e33fad947bd073e27ec4f18d804713':
Added a warning when the profile has an owner
2014-08-28 14:01:41 +00:00
Selim Cinek
075d4141bc
am 3ec368c1: am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit '3ec368c1a18982eaed446e60a4f9fde05f853549':
Fixed a flash of the preview image when going to the dialer
2014-08-28 13:55:34 +00:00
Selim Cinek
07c0d68e5c
am 9f1a9f49: am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit '9f1a9f49de0e88cb4b4c66a6e14eb6cc98289c9a':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 13:55:23 +00:00
John Spurlock
356014f7a8
am 9736f6a4: am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '9736f6a4550307f3025ca8c458da6440bed318a6':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 13:49:40 +00:00
Selim Cinek
f1d8349bb3
am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner
...
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
Added a warning when the profile has an owner
2014-08-28 13:49:25 +00:00
Selim Cinek
e2557b4e33
am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
...
* commit 'b2cb86eef21897285244d2216ca9fbafa70adfd9':
Fixed a flash of the preview image when going to the dialer
2014-08-28 13:48:18 +00:00
Selim Cinek
9ddc82dff3
am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
...
* commit 'a5ed4d381d4f1ca6b5056b7aefd2e5bc7b8c9667':
Fixed a bug where notifications could remain in the overlay.
2014-08-28 13:48:14 +00:00
Selim Cinek
1a08a8f52f
Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
2014-08-28 13:37:23 +00:00
John Spurlock
c22fd76b66
am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
...
* commit '9af66133917d4cb0a5252f9f52e1352e72637bf0':
Zen: Remove alarm warnings, color the subhead instead.
2014-08-28 13:36:47 +00:00
Selim Cinek
9a37d4bc3c
am 1bebe3c0: Added a warning when the profile has an owner
...
* commit '1bebe3c049c41a13bd5143c7ceec9d222ddd2d7d':
Added a warning when the profile has an owner
2014-08-28 13:36:37 +00:00
Selim Cinek
05546f455d
Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
2014-08-28 13:36:00 +00:00
John Spurlock
d7a94b3545
Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
2014-08-28 13:30:31 +00:00
Selim Cinek
0d61b51852
Fixed a flash of the preview image when going to the dialer
...
The preview image was animating even though it should not have
leading to a weird flash.
Bug: 17261091
Change-Id: I168eae25eb654ceb79e055fb0d0189c31cb0bb3d
2014-08-28 15:09:29 +02:00
Selim Cinek
95ed59283b
Fixed a bug where notifications could remain in the overlay.
...
This led to notifications being visible even though they should
have been removed
Bug: 17295716
Change-Id: I05a243d5c9ca359d1f5ca29a7535935d6e61a4d6
2014-08-28 15:09:29 +02:00
Selim Cinek
24ac55e658
Added a warning when the profile has an owner
...
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.
Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
2014-08-28 15:09:28 +02:00
Jorim Jaggi
3363b908bb
am 8484d990: am 0b198fa9: am 1c20d304: Start intent chooser after Keyguard is gone
...
* commit '8484d990efafd7d10888a56beb0221b0c4148468':
Start intent chooser after Keyguard is gone
2014-08-28 12:53:54 +00:00
Jorim Jaggi
d0bca271e3
am 0b198fa9: am 1c20d304: Start intent chooser after Keyguard is gone
...
* commit '0b198fa9d4151243fb98936c3b19e33b466fcc7b':
Start intent chooser after Keyguard is gone
2014-08-28 12:42:03 +00:00
Jorim Jaggi
109cb57afa
am 1c20d304: Start intent chooser after Keyguard is gone
...
* commit '1c20d304810aa73ae5a73fc8c555599d33fc411f':
Start intent chooser after Keyguard is gone
2014-08-28 12:30:01 +00:00
Jorim Jaggi
a076303434
am f90463b9: am 222fb84e: am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev
...
* commit 'f90463b978e22cdf9dd12289b5fe8bcddddd09c7':
Fix large text setting for QS
2014-08-28 11:33:31 +00:00
Jorim Jaggi
74610a7b9c
am 222fb84e: am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev
...
* commit '222fb84ecc32032147a8414a69bbf3e7d6023442':
Fix large text setting for QS
2014-08-28 11:21:59 +00:00
Jorim Jaggi
75126cd654
am 5f76e441: am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev
...
* commit '5f76e4414f46783a55e14ba09cae462e74bd6949':
Make it possible to disable camera on lockscreen
2014-08-28 11:21:48 +00:00
Jorim Jaggi
746f7facf2
Start intent chooser after Keyguard is gone
...
If we have an intent chooser on the camera intent, we need to launch
it after the Keyguard is fully gone because the ResolveActivity would
finish itself if it is launched behind the Keyguard.
Bug: 16570873
Change-Id: I2fdb4975fa0a6510e8853c6042383089570ec1f5
2014-08-28 13:10:12 +02:00
Jorim Jaggi
524735e3ba
am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev
...
* commit '18cc6ef2eadd6ffa15cbdefe59270bda8a94bf4b':
Make it possible to disable camera on lockscreen
2014-08-28 11:10:03 +00:00