Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,388 Commits 3 Branches 0 Tags
984e0eeedbc96573e28da0e8a707ff40b8743f2e
Commit Graph

6795 Commits

Author SHA1 Message Date
Chris Wren
d6c6cd80f0 am 7c528397: am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7c528397b54ca5b6cb865e7ba37754f3a831830c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-09-02 07:09:56 +00:00
Winson Chung
b5ec00fa32 am 80bc0c48: am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '80bc0c48cdd472b8abd57b7cab143125b6d0f0a5':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-09-02 07:09:51 +00:00
Baligh Uddin
7bf55b8263 Import translations. DO NOT MERGE 
Change-Id: I104b3d96d10954a6390802324ed0bd9ede42d6e1
Auto-generated-cl: translation import
 2014-08-31 16:20:43 -07:00
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
ab7640592c am c035cac5: am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit 'c035cac52d86f4dd97e4c50e477d7b0eed3c5a4a':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 19:15:44 +00:00
Jorim Jaggi
6509a5d8b9 am cb9e89ef: am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit 'cb9e89efa031666568d46ffeb3fb425138ff5c97':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 19:15:38 +00:00
Jorim Jaggi
a760ad3792 am c74fb0eb: am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit 'c74fb0ebdb9108f8517e1b54d26305f048c4c9e9':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 19:15:32 +00:00
Jorim Jaggi
c70110fabf am 3a28b9a8: am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '3a28b9a8bceee4b48476f1d3518a694801267e4c':
  Update paddings for more card to match notification layouts
 2014-08-29 19:15:27 +00:00
Kenny Guy
f7db26a598 am de28d664: am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'de28d664e33c27f432f8f0ba379ad213488fd10d':
  Load ApplicationInfo for correct user.
 2014-08-29 19:15:13 +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
985bcb05cf am 5f2d2764: am 5e3fa41f: am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '5f2d2764c3bafd883992f07d569c490e1cd0cc13':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 22:58:46 +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
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
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
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
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