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

10615 Commits

Author SHA1 Message Date
Winson Chung
11e7d7a5bd am 5e3fa41f: am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '5e3fa41f23f6bee75200e8700fd7febf71409009':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 22:38:53 +00:00
Winson Chung
fa09657c09 am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '2beddd4d78f6028b4b32058bd48c1d7f5955e09f':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 21:42:05 +00:00
Winson Chung
bb6c033351 Merge "Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)" into lmp-dev 2014-08-28 21:14:22 +00:00
Kenny Guy
a734fc1ece Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317) 
Change-Id: I10bcb60abe3450f2ecfb3ee305be505e13e0be3b
 2014-08-28 13:58:29 -07: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
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
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
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
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
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
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
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
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
Jorim Jaggi
ff24c77811 am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit '6b5a7d8247b46da8d14fe4e0bb2cf309eb68b9ce':
  Fix large text setting for QS
 2014-08-28 11:09:28 +00:00
Jorim Jaggi
2cad81b2a2 am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '5df9d4c47d12424fb5d6653fef6b8e8952af40b5':
  Make it possible to disable camera on lockscreen
 2014-08-28 10:57:46 +00:00
Jorim Jaggi
d757d6bfc6 Merge "Fix large text setting for QS" into lmp-dev 2014-08-28 10:57:45 +00:00
Jorim Jaggi
e17c4b49a4 Fix large text setting for QS 
Bug: 15591223
Change-Id: I9f514a4970edbda778b987dfc3eca3914e492011
 2014-08-28 12:49:32 +02:00
Jorim Jaggi
87078b738b Merge "Make it possible to disable camera on lockscreen" into lmp-dev 2014-08-28 10:46:37 +00:00
Alan Viverette
41ad39421d Rename StatusBar.Material styles to Material.Notification 
Replaces a removed style with __removed to avoid breaking
existing apps. This will be (wait for it...) removed prior
to release.

BUG: 17288986
Change-Id: I7e934fcebe39baed39fd8b01bf12bf3bb41305ad
 2014-08-28 05:14:03 +00:00
John Spurlock
8f8ecd620c Zen: Remove alarm warnings, color the subhead instead. 
- When selecting "None" in the dialog, remove the footer warnings
  about alarms, and associated bits.
- Update subhead text for "None".
- Keep track of how often "None" is used (defined as a user change
  during a visible dialog session) and color the subhead text
  with the warning color until it's been used five times.

Bug:17283115
Change-Id: Ief8a1c557716ec2f581b8338511432d17ac0d371
 2014-08-27 17:46:03 -04:00
Winson Chung
275720fe43 am 1e1c328f: am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '1e1c328f9e9605e8eed1e9729067dfd702fb4f81':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 21:36:24 +00:00
John Spurlock
2f47f7fc40 am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '8354e2846d962b054c85832b62b621bd8ae1ff48':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 21:35:55 +00:00