Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,596 Commits 3 Branches 0 Tags
617cfa8e3cd8dfd343e6ecc4887f8b803240dffd
Commit Graph

6545 Commits

Author SHA1 Message Date
Chris Wren
3f420855ae am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit 'a69ad7a380c246f3665984aad4ce53cf9e025e8c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:53:05 +00:00
Winson Chung
9cd74d9835 am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '73a6148e4be868e8eb4ffef9b5fbc8afd502ebff':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:53:00 +00:00
Chris Wren
3cdfa64906 am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7d0a2a7f7d0e87fa76dbf7c29b91a9ce4331b733':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:33:48 +00:00
Winson Chung
f4e4a782d9 am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '82f0abc42920441dca10be57ba0287a1e7dd3a46':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:33:43 +00:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Winson Chung
02d4927082 Workaround to prevent starting the same task from Recents twice. (Bug 17322903) 2014-08-29 21:14:32 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade. 
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
 2014-08-29 20:49:36 +00:00
Selim Cinek
d87f226129 am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit 'c01216640b76f6511d2b3320f83eef14e74ecbfc':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 18:52:32 +00:00
Jorim Jaggi
2e09793c2e am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 18:52:27 +00:00
Jorim Jaggi
0c91868065 am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit 'd2f9ac2729876aa7eab211e9698d1035d2b2c623':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 18:52:07 +00:00
Jorim Jaggi
3db48ac715 am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '243a2bcb25c3dc3dfdf13fe81d1f840ae35b7b22':
  Update paddings for more card to match notification layouts
 2014-08-29 18:52:02 +00:00
Kenny Guy
42fc95cedc am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'd74446b251aa2258ef6bbff33019a236836630be':
  Load ApplicationInfo for correct user.
 2014-08-29 18:50:30 +00:00
Selim Cinek
64bdd35340 am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit '702d4abba6e2b00c34529ddc757018b6b8e17fe1':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 17:15:39 +00:00
Jorim Jaggi
9acdc4a37c am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit '4c1f1f87943c3694df9fb541939c1a08decf070b':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 17:15:34 +00:00
Jorim Jaggi
c6d25c9b89 am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit '5224a3f29ac75dc0c9493bc45fa593dde8872b8d':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 16:47:53 +00:00
Jorim Jaggi
7a79b33039 am 35d00b45: Update paddings for more card to match notification layouts 
* commit '35d00b452b8417d920f855b914559695a3a73d79':
  Update paddings for more card to match notification layouts
 2014-08-29 16:47:48 +00:00
Selim Cinek
e73a0a0195 Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 2014-08-29 16:44:23 +00:00
Jorim Jaggi
497e699553 Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 2014-08-29 16:42:59 +00:00
Jorim Jaggi
b5428e16cd Revert "Content description for padlock icon depending on state" 
This reverts commit 1518196a94ed006b2b45e5dc527a23721ec1147a.

It turned out that just "Unlock" is a better label there, as
announcing the state might be confusing.

Bug: 17255298
Change-Id: I13f3b3db68f3f96afcd4db33baf07e7e213aa12c
 2014-08-29 18:42:32 +02:00
Jorim Jaggi
2cf8b71e14 Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 2014-08-29 16:42:01 +00:00
Jorim Jaggi
2c33d5dcae Only dismiss Keyguard with space when screen is on 
Bug: 17206291
Change-Id: I7fd9c77a0810bb71c0e4193ab121398e8e78d43b
 2014-08-29 18:41:03 +02:00
Jorim Jaggi
6b58ab5809 Update paddings for more card to match notification layouts 
Bug: 15437369
Change-Id: I6e9b1ce420d1d7217a455519a746ad28ed1fa75d
 2014-08-29 16:40:06 +00:00
Selim Cinek
9f6ceb1d1c Increasing the delay for the volume warning dialog with talkback 
Bug: 17145793
Change-Id: I27eb9c46c8d73d5e475f97b50b0a2f219c4ed6fb
 2014-08-29 16:28:39 +02:00
Kenny Guy
4f9cbd2a2b am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit '21e106f8c1578767a829bd8895b8d101af3b4f8d':
  Load ApplicationInfo for correct user.
 2014-08-29 11:10:09 +00:00
Kenny Guy
d5936307fb Merge "Load ApplicationInfo for correct user." into lmp-dev 2014-08-29 11:01:04 +00:00
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
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
John Spurlock
1a3febe711 Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 2014-08-28 19:45:53 +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
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
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