Winson Chung
2570c282ee
am 6ac3367d: Merge "Enabling filtering by base intent package."
...
* commit '6ac3367d5df999736470f29a2bbb623864f06d1a':
Enabling filtering by base intent package.
2014-04-01 23:15:08 +00:00
Winson Chung
6ac3367d5d
Merge "Enabling filtering by base intent package."
2014-04-01 23:10:26 +00:00
Winson Chung
c6a1623cc4
Enabling filtering by base intent package.
...
- Toggling recents now unfilters the current stack before dismissing recents
Change-Id: Id0d240bf16bc32957ee7e5a9882a453044903d29
2014-04-01 15:31:52 -07:00
John Spurlock
2f95b54a2e
am f96b6c42: Merge "Zen Mode QS tweaks."
...
* commit 'f96b6c427fc8c3593de3edc1c857b27ed7810f4c':
Zen Mode QS tweaks.
2014-04-01 20:50:24 +00:00
John Spurlock
f96b6c427f
Merge "Zen Mode QS tweaks."
2014-04-01 20:41:08 +00:00
John Spurlock
1bdb48e31a
Zen Mode QS tweaks.
...
- Move settings button to the bottom.
- Align title left.
- Fix padding.
- Auto-activate on dialog launch.
Bug:13670014
Change-Id: I5a88e97a84b66bf6200473c147b71cc7ceeb0b95
2014-04-01 16:38:05 -04:00
Paul Lawrence
da7ff92c48
am df42723d: Merge "Don\'t double prompt on booting encrypted device"
...
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
Don't double prompt on booting encrypted device
2014-04-01 15:11:31 +00:00
Paul Lawrence
df42723d6b
Merge "Don't double prompt on booting encrypted device"
2014-04-01 15:07:10 +00:00
Baligh Uddin
9fa67d8e4d
Merge "Import translations. DO NOT MERGE"
2014-03-31 22:09:54 +00:00
Adrian Roos
66b585f268
am a3dafcfb: Add a SampleTrustAgent
...
* commit 'a3dafcfb26117e3a2efa3983bd7ba79ae6831680':
Add a SampleTrustAgent
2014-03-31 19:31:46 +00:00
Adrian Roos
a3dafcfb26
Add a SampleTrustAgent
...
Adds a simple app that shows how to build a trust agent. For
lack of a better place to put this, this stays in Keyguard's tests
for now.
Bug: 13723878
Change-Id: I9ebad253d3d89c846fe8afaad6babce9e7b80b5e
2014-03-31 19:27:52 +00:00
Adrian Roos
e5bfd6d7ce
am 46842d94: Make Keyguard trust aware
...
* commit '46842d946d1777c22f05e6bb96933c1b5cbd00d4':
Make Keyguard trust aware
2014-03-31 19:26:01 +00:00
Adrian Roos
46842d946d
Make Keyguard trust aware
...
Bug: 13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3
2014-03-31 19:22:48 +00:00
Chris Wren
65b1dad7dd
am e1791add: Merge "add a null check around scrollAdapter access"
...
* commit 'e1791add1a19f1860084889188168ca32fdf3924':
add a null check around scrollAdapter access
2014-03-31 18:58:46 +00:00
Chris Wren
de3b1a2b2d
add a null check around scrollAdapter access
...
Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
2014-03-31 14:47:59 -04:00
Baligh Uddin
22339a562d
Import translations. DO NOT MERGE
...
Change-Id: I873e19f2b3e2e27eb1bc555ef8cc3cc09f2de493
Auto-generated-cl: translation import
2014-03-31 11:25:46 -07:00
Alexandra Gherghina
b187909c08
am bd6738b2: Merge "Mark the keyguard package as required for profile"
...
* commit 'bd6738b2e11b8861cb4a420f437343b3c80a21c9':
Mark the keyguard package as required for profile
2014-03-31 16:22:19 +00:00
Alexandra Gherghina
d4749eb4a8
Mark the keyguard package as required for profile
...
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
2014-03-31 16:15:40 +01:00
Michael Wright
49e948cbeb
am 7ef7ef0e: am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit '7ef7ef0e05736698d44876f3e51b841a2dac9be1':
Add support for additional international keyboard mappings
2014-03-29 00:00:23 +00:00
Michael Wright
7ef7ef0e05
am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit 'c9b937bbfae825e32158e06ca52f320ca3d6f464':
Add support for additional international keyboard mappings
2014-03-28 23:40:30 +00:00
Michael Wright
c9b937bbfa
am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
Add support for additional international keyboard mappings
2014-03-28 23:05:36 +00:00
Paul Lawrence
945490c12e
Don't double prompt on booting encrypted device
...
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.
This is a revision of
https://googleplex-android-review.git.corp.google.com/#/c/418123/
which was reverted. It had two bugs in LockSettingsService.checkVoldPassword.
1) We were not checking password for null, which caused an exception
2) checkPattern/checkPassword return true if there is no saved pattern or password.
This leads to situations where we get true returned even when the password
doesn't match. Call the correct one based on what is there, not what vold
thinks ought to be there.
Bug: 12990752
Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
2014-03-28 10:35:44 -07:00
John Spurlock
f9b1eea695
am 0e14f2d4: Merge "Remove obsolete MultiWaveView"
...
* commit '0e14f2d45557527242f27ce7de9027e6ccaa45d6':
Remove obsolete MultiWaveView
2014-03-28 13:13:50 +00:00
John Spurlock
0e14f2d455
Merge "Remove obsolete MultiWaveView"
2014-03-28 13:11:09 +00:00
Selim Cinek
b48d79b022
am ba6ae57f: Merge "Improved expansion logic of NotificationStackScroller"
...
* commit 'ba6ae57f64e09fd9240640b6a0dd538e5f349bf1':
Improved expansion logic of NotificationStackScroller
2014-03-28 12:23:46 +00:00
Selim Cinek
ba6ae57f64
Merge "Improved expansion logic of NotificationStackScroller"
2014-03-28 12:19:01 +00:00
Selim Cinek
fab078b01f
Improved expansion logic of NotificationStackScroller
...
Expansion of a notification with a single finger is now possible
if the NotificationStackScroller has not started scrolling yet.
Change-Id: I96b622632b448915526dd08cc2e4771d404b096f
2014-03-28 12:00:55 +00:00
Selim Cinek
5fdd8b27c3
am 49fb8aef: am c3db8011: am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '49fb8aeff5b1ee928f698860c1915b742a3adbf7':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:22:29 +00:00
Selim Cinek
49fb8aeff5
am c3db8011: am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit 'c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:16:51 +00:00
Selim Cinek
c3db8011d7
am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '58e99f564d552984d5088969a2aa827812db10ac':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:10:32 +00:00
Selim Cinek
58e99f564d
am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit 'b6e077dcbe1034007fd52b48951637a9be4bab74':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:04:57 +00:00
Selim Cinek
b6e077dcbe
am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '7718fc1291c73576417f0c25d88f5105f7ae7365':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 22:15:37 +00:00
Baligh Uddin
70039b67a5
Merge "Import translations. DO NOT MERGE"
2014-03-27 21:43:30 +00:00
Selim Cinek
7718fc1291
Fixed crash when setting wallpaper with built in rotation
...
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees
Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
2014-03-27 19:34:01 +00:00
Selim Cinek
69fd271f46
am d00e8b5f: Merge "Improved integration of NotificationStackScroller"
...
* commit 'd00e8b5f7c5ac62f1fa4f6bd8746b57aeb42a8c0':
Improved integration of NotificationStackScroller
2014-03-27 17:26:40 +00:00
Selim Cinek
80a14e5d1b
Improved integration of NotificationStackScroller
...
Quicksettings and clear all buttons now work correctly with
NotificationStackScroller but visuals are still tbd
Change-Id: Ia8a0895f66e0b682f39ac62d92c6b6cfccce2ee2
2014-03-27 18:18:49 +01:00
Olivier Gay
d2923266ae
Add support for additional international keyboard mappings
...
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).
Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-03-27 17:49:52 +01:00
Selim Cinek
5ac398675a
am ddaba436: Merge "Initial implementation of NotificationStackScroller"
...
* commit 'ddaba4360b86f96307ec88f0d0b145425bc3e128':
Initial implementation of NotificationStackScroller
2014-03-27 14:31:01 +00:00
Jorim Jaggi
9451c34474
am 73581eff: Merge "Move legacy notification processing to Notification.Builder"
...
* commit '73581effb0b4029961501c6f699e95a9930ea1e6':
Move legacy notification processing to Notification.Builder
2014-03-27 14:30:58 +00:00
Selim Cinek
ddaba4360b
Merge "Initial implementation of NotificationStackScroller"
2014-03-27 14:28:56 +00:00
Jorim Jaggi
73581effb0
Merge "Move legacy notification processing to Notification.Builder"
2014-03-27 14:25:17 +00:00
Selim Cinek
67b2260093
Initial implementation of NotificationStackScroller
...
Change-Id: Ida9a90ca4c9645166794afea8cf0c1d1b7afe1b4
2014-03-27 14:56:07 +01:00
Jorim Jaggi
5c2d84675b
Move legacy notification processing to Notification.Builder
...
Bug: 13485610
Change-Id: I5466d3dbc328c77876dc701c17e7a5a06777dbbe
2014-03-27 12:08:55 +01:00
John Spurlock
4f0db5e23a
Remove obsolete MultiWaveView
...
Change-Id: Ic878221c873d29577928aed2669f967851307e4d
2014-03-26 21:52:03 -04:00
Paul Lawrence
96a6b115c1
am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decrypting"
...
* commit '6ee7d25010d4f23b44a151f3953225ba253de8af':
Revert "Don't prompt at boot if we already did that when decrypting"
2014-03-26 23:43:32 +00:00
Paul Lawrence
6ee7d25010
Revert "Don't prompt at boot if we already did that when decrypting"
...
This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.
Should fixes
Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
2014-03-26 22:31:04 +00:00
Baligh Uddin
2ab8525654
Import translations. DO NOT MERGE
...
Change-Id: I2a3bcccf660a5a5247b3f54a8a3783ddeae7ccfa
Auto-generated-cl: translation import
2014-03-26 11:50:47 -07:00
John Spurlock
f811f917ba
am 1dd9c53a: Merge "Zen mode updates."
...
* commit '1dd9c53a40b7c147767c63e10a47eb5cb6f8e197':
Zen mode updates.
2014-03-26 10:45:59 -07:00
John Spurlock
1dd9c53a40
Merge "Zen mode updates."
2014-03-26 17:44:16 +00:00
John Spurlock
eeb397b77f
Zen mode updates.
...
- Now only two modes, no more ZEN_MODE_FULL.
- Alarms are allowed by default.
- Interstitial dialog cleanup to follow current UX.
Change-Id: I8e4c8f64854dabfef69ad33b3eb35bee07e55ef7
2014-03-26 13:41:54 -04:00