Jorim Jaggi
d529e294ae
Merge "Reuse KeyguardViewMediator for new Keyguard implementation." into master-lockscreen-dev
2014-03-31 19:11:32 +00:00
Chris Wren
bf430edf3e
am e1791add: Merge "add a null check around scrollAdapter access"
...
* commit 'e1791add1a19f1860084889188168ca32fdf3924':
add a null check around scrollAdapter access
2014-03-31 18:59:03 +00:00
Jorim Jaggi
5cf17879a3
Reuse KeyguardViewMediator for new Keyguard implementation.
...
This change reuses KeyguardViewMediator for the new Keyguard
implementation in status bar. KeyguardViewManager is replaced by
StatusBarKeyguardManager which handles adding the view, setting the
state etc. StatusBarWindowManager is introduced to managed the window
of the status bar, which has the logic of both the old Keyguard window
and the old status bar window. In the current implementation, Keyguard
gets displayed like it would be in the bouncer state, but that's likely
to change in the future. Also, setHidden in IKeyguardService is also
renamed to setOccluded, as the word hidden interferes with the
terminology when dismissing the Keyguard.
Bug: 13635952
Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
2014-03-31 20:58:31 +02:00
Chris Wren
de3b1a2b2d
add a null check around scrollAdapter access
...
Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
2014-03-31 14:47:59 -04:00
Alexandra Gherghina
053cee7822
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:01 +00:00
Alexandra Gherghina
d4749eb4a8
Mark the keyguard package as required for profile
...
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
2014-03-31 16:15:40 +01:00
Jorim Jaggi
8ae65aecc8
Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63
...
Bug: 13635952
Change-Id: I5d2bd44b3588621f26d94baab161e4e2444197a8
2014-03-31 12:15:18 +00:00
Jorim Jaggi
bd490ad59f
Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev
2014-03-31 12:05:54 +00:00
Michael Wright
0e4ee514b0
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-28 23:46:08 +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
Jorim Jaggi
380ecb81db
Make Keyguard a library and make StatusBar the new Keyguard.
...
This change achieves a couple of things:
- Let Keyguard be a library, so we can use it in SystemUI.
- Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make
all the TYPE_KEYGUARD behaviour dependant on the flag.
- Implement a new KeyguardService in SystemUI, and bind that service
from PhoneWindowManager.
- Introduce BaseStatusBar.setKeyguardState and inflate
KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such
that the status bar window essentially gets the Keyguard.
Bug: 13635952
Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
2014-03-28 22:35:03 +01:00
John Spurlock
ca4761661a
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
c0ed38f5e7
am ba6ae57f: Merge "Improved expansion logic of NotificationStackScroller"
...
* commit 'ba6ae57f64e09fd9240640b6a0dd538e5f349bf1':
Improved expansion logic of NotificationStackScroller
2014-03-28 12:24:40 +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
01b2ebf896
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:16 +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
Baligh Uddin
1d181b8227
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
2014-03-27 21:43:27 +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
dbcd60d740
am d00e8b5f: Merge "Improved integration of NotificationStackScroller"
...
* commit 'd00e8b5f7c5ac62f1fa4f6bd8746b57aeb42a8c0':
Improved integration of NotificationStackScroller
2014-03-27 17:24:20 +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
257d5e4ff4
am ddaba436: Merge "Initial implementation of NotificationStackScroller"
...
* commit 'ddaba4360b86f96307ec88f0d0b145425bc3e128':
Initial implementation of NotificationStackScroller
2014-03-27 14:30:12 +00:00
Jorim Jaggi
d76950581a
am 73581eff: Merge "Move legacy notification processing to Notification.Builder"
...
* commit '73581effb0b4029961501c6f699e95a9930ea1e6':
Move legacy notification processing to Notification.Builder
2014-03-27 14:30:09 +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
c039034b7e
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-27 01:45:40 +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
a5a9eb9f14
Import translations. DO NOT MERGE
...
Change-Id: I25bb65df54d2a9308eb63084db800848cff8ad0d
Auto-generated-cl: translation import
2014-03-26 11:51:44 -07: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
9bdb3c8ebb
am 1dd9c53a: Merge "Zen mode updates."
...
* commit '1dd9c53a40b7c147767c63e10a47eb5cb6f8e197':
Zen mode updates.
2014-03-26 17:46:01 +00: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
Chris Wren
6dcd93246f
am 4c319992: Merge "always clear the HeadsUpDecayTimer"
...
* commit '4c3199928250dfea6307809fd0a2091c78a75240':
always clear the HeadsUpDecayTimer
2014-03-26 17:13:42 +00:00
Chris Wren
4c31999282
Merge "always clear the HeadsUpDecayTimer"
2014-03-26 17:09:55 +00:00
Chris Wren
7fd2a3bf6a
always clear the HeadsUpDecayTimer
...
for non-clearable heads up notifications,
a decay timer may be left in the queue
Bug: 13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
2014-03-26 13:09:18 -04:00
Dan Sandler
ebc3993c01
am 59f0258a: Categorize some system notifications.
...
* commit '59f0258a27ebaf8468919a9d2855c41f0429238d':
Categorize some system notifications.
2014-03-26 01:36:31 +00:00
Dan Sandler
59f0258a27
Categorize some system notifications.
...
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
2014-03-26 01:31:04 +00:00
Selim Cinek
f5f1650011
am 92a87e30: am 50cd7c39: am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '92a87e302625c69c6a52c3cb595b9ecfacf29129':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-25 23:00:58 +00:00
Winson Chung
2246b7412c
am c9b0d582: Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
...
* commit 'c9b0d582071c7b4fb2538b86e2e0c4c2f914b664':
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
2014-03-25 22:59:36 +00:00
Winson Chung
bcb3880315
am 75c549c5: Merge "Moving task view layout into resource."
...
* commit '75c549c537cf44d1f1bb13422a950637f7f5c489':
Moving task view layout into resource.
2014-03-25 22:59:29 +00:00