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
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
Chris Wren
0f1bf07453
am 8ed3b587: Merge "add more dump info for heads up notifications"
...
* commit '8ed3b587f00ccb1b4264d2ee3590af32464428c9':
add more dump info for heads up notifications
2014-03-25 22:58:22 +00:00
Winson Chung
e6aa32dcc5
am e9c77aee: Merge "Fixing crash with multiple touch pointers"
...
* commit 'e9c77aee60fbb781db916d32fe1db81e1d973f8f':
Fixing crash with multiple touch pointers
2014-03-25 22:57:18 +00:00
Paul Lawrence
854037f94f
am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
...
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
2014-03-25 22:57:11 +00:00
Adam Cohen
21f2fcb3f5
am fb40d78c: Merge "Catch exceptions if Exif is malformed"
...
* commit 'fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
2014-03-25 22:56:57 +00:00
Adam Cohen
d314a24b12
am 146af201: Merge "Catching security exception when activity destroyed"
...
* commit '146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
2014-03-25 22:56:54 +00:00
John Spurlock
441bdc251f
am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
...
* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
2014-03-25 22:56:51 +00:00
Selim Cinek
8b11463885
am a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
...
* commit 'a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
Disable Set Wallpaper button while loading image
2014-03-25 22:56:48 +00:00
Selim Cinek
92a87e3026
am 50cd7c39: am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-25 21:18:45 +00:00
Baligh Uddin
05f79758cd
Merge "Import translations. DO NOT MERGE"
2014-03-25 18:56:41 +00:00
Baligh Uddin
da94c0efe9
Merge "Import translations. DO NOT MERGE"
2014-03-25 18:56:24 +00:00
Baligh Uddin
20de38b9ab
Merge "Import translations. DO NOT MERGE"
2014-03-25 18:56:23 +00:00
Baligh Uddin
52528c5ef0
Merge "Import translations. DO NOT MERGE"
2014-03-25 18:56:18 +00:00
Baligh Uddin
d894e15c13
Merge "Import translations. DO NOT MERGE"
2014-03-25 18:52:33 +00:00