Dan Sandler
352e108259
Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"
2014-04-14 17:54:22 +00:00
Baligh Uddin
245cbfb1fa
Import translations. DO NOT MERGE
...
Change-Id: I0c4a5560a6d7955bb97b50ef882ba11acc0760fd
Auto-generated-cl: translation import
2014-04-14 10:43:07 -07:00
Alan Viverette
a736818cc7
am 24e2e667: Merge "Clean up VolumePanel, tweak volume & brightness dialog styling"
...
* commit '24e2e6674d45acf22d9008368ee692746a5971ab':
Clean up VolumePanel, tweak volume & brightness dialog styling
2014-04-11 23:26:28 +00:00
Alan Viverette
e8ebaf3f6f
Clean up VolumePanel, tweak volume & brightness dialog styling
...
Change-Id: Ibd008fbc6acab00bf642422cb322ec147799d3d7
2014-04-11 15:44:15 -07:00
Jorim Jaggi
e46f521161
Change scrim on lockscreen and transparency of cards a bit.
...
Bug: 13635952
Change-Id: Iaae4728fd7ed4944b3a2b80343bbdeaa5438ca9c
2014-04-11 19:28:32 +02:00
Adrian Roos
58aae51102
Merge "Set a dark theme for SystemUI." into master-lockscreen-dev
2014-04-10 23:43:22 +00:00
Adrian Roos
070a0b61cd
Set a dark theme for SystemUI.
...
The default theme for the platform has changed to a
light variant. This puts SystemUI back in the dark.
Bug: 13635952
Change-Id: I230a2078ba6bf5a79c768f0e357fcbd75f283cf8
2014-04-11 01:36:33 +02:00
Alan Viverette
bd04b22a35
am 316e533a: Merge "Update brightness icons to use color attribute"
...
* commit '316e533ab0ac9888af9e6c3db44e886dd50312e1':
Update brightness icons to use color attribute
2014-04-10 23:20:19 +00:00
Alan Viverette
55e41ea6df
am 316e533a: Merge "Update brightness icons to use color attribute"
...
* commit '316e533ab0ac9888af9e6c3db44e886dd50312e1':
Update brightness icons to use color attribute
2014-04-10 23:17:50 +00:00
Alan Viverette
515a48a018
Update brightness icons to use color attribute
...
BUG: 13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
2014-04-10 16:14:40 -07:00
Adrian Roos
0c5c18a2be
Merge "Implement camera affordance" into master-lockscreen-dev
2014-04-10 19:43:41 +00:00
Adrian Roos
5e25caae7a
Implement camera affordance
...
Makes camera on lockscreen work again.
Bug: 13635952
Change-Id: Iec6324651a23289932a5e9816332b6727c23d096
2014-04-10 17:37:08 +02:00
Jorim Jaggi
d4a57440ca
Limit notifications on lockscreen to a maximum 4.
...
All the other notifications are going to be collapsed in a "n more"
card.
Bug: 13635952
Change-Id: I18471c7b18d05d27e92c49ee8214605f1a151927
2014-04-10 16:51:15 +02:00
Winson Chung
bdcf525a89
am 2adb9586: Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view."
...
* commit '2adb95860f9682ed2c4893da58679540cd8cac56':
Allow for different rects when animating to a single task stack view and a multiple task stack view.
2014-04-09 23:56:37 +00:00
Winson Chung
00cecfbb32
am 2adb9586: Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view."
...
* commit '2adb95860f9682ed2c4893da58679540cd8cac56':
Allow for different rects when animating to a single task stack view and a multiple task stack view.
2014-04-09 23:54:49 +00:00
Winson Chung
2adb95860f
Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view."
2014-04-09 23:50:33 +00:00
John Spurlock
1fcb5400b3
resolved conflicts for merge of 3c86a27d to master-lockscreen-dev
...
Change-Id: Idcf46beb8790ff95566942d1633baf70ca5eddf8
2014-04-09 18:33:06 -04:00
John Spurlock
50ee51d955
am 3c86a27d: Merge "Put suppressed notifications behind a summary notification."
...
* commit '3c86a27d3e9044d04d0f176e59a1ebbcd774a54c':
Put suppressed notifications behind a summary notification.
2014-04-09 21:49:27 +00:00
John Spurlock
3c86a27d3e
Merge "Put suppressed notifications behind a summary notification."
2014-04-09 21:45:36 +00:00
Winson Chung
0d767551c5
Allow for different rects when animating to a single task stack view and a multiple task stack view.
...
- Fixing regression in task bar enter animation duration
- Fixing issue with extra long titles in the task bar
- Cleaning up some constants and unused code
2014-04-09 14:33:23 -07:00
John Spurlock
bf20eab6fc
Put suppressed notifications behind a summary notification.
...
Bug:13726563
Change-Id: Ib1c3fba3a328792dc674c8403735f75d4db41973
2014-04-09 16:52:20 -04:00
Jorim Jaggi
251957d76e
Double tap interaction for notifications on lockscreen.
...
This change also uses a different background for notifications on the
lockscreen and moves the background drawable from the templates to
SystemUI.
Bug: 13635952
Change-Id: Icf09178065aa7fc0472adef70342d637fbcca785
2014-04-09 18:11:45 +02:00
Alan Viverette
5ab5382003
am 18c7f559: Merge "Make toggle slider use default assets"
...
* commit '18c7f559a02d3c1a250ecb0aebcd76d5291110b9':
Make toggle slider use default assets
2014-04-09 00:46:06 +00:00
Alan Viverette
cedef17fa6
am 18c7f559: Merge "Make toggle slider use default assets"
...
* commit '18c7f559a02d3c1a250ecb0aebcd76d5291110b9':
Make toggle slider use default assets
2014-04-09 00:45:24 +00:00
Alan Viverette
f6a679870f
Make toggle slider use default assets
...
BUG: 13817697
Change-Id: Ibae671a35b55a195b40d8c943f45685fb7b3ac4f
2014-04-08 15:27:24 -07:00
Adrian Roos
9a0a4c9d7e
Enable quick settings from lockscreen and merge into one shade.
...
Change-Id: Ic5b5f54bcfe3816549287f707715e29340522d9b
2014-04-08 18:25:34 +02:00
Adrian Roos
5a46cd37c2
Add a temporary user switcher to quick settings
...
Change-Id: I7ebe29049812fe5ac98b702f3378a1121d5d6bb7
2014-04-08 16:07:46 +02:00
Jorim Jaggi
03c701ec58
Basic implementation for notifications on lockscreen.
...
This change makes PhoneStatusBar expand while the lockscreen is
showing. Further, the KeyguardSimpleHostView is shown by
KeyguardBouncer, and the Bouncer is shown whenever the user tries to
unlock the phone (closing the shade).
Bug: 13635952
Change-Id: I4354b7a7937af6e1c93abf16ad6e485376d16bc2
2014-04-05 16:50:36 +02:00
Winson Chung
8906c16e57
am e8cfc94e: Merge "Fixing crash when filtering tasks too quickly."
...
* commit 'e8cfc94ef624746c54a968d06c659c7f3b0b33f2':
Fixing crash when filtering tasks too quickly.
2014-04-04 17:28:53 +00:00
Winson Chung
b1fbd3b92f
am e8cfc94e: Merge "Fixing crash when filtering tasks too quickly."
...
* commit 'e8cfc94ef624746c54a968d06c659c7f3b0b33f2':
Fixing crash when filtering tasks too quickly.
2014-04-04 17:26:31 +00:00
Winson Chung
e8cfc94ef6
Merge "Fixing crash when filtering tasks too quickly."
2014-04-04 17:22:07 +00:00
Winson Chung
2f2ca08baa
Fixing crash when filtering tasks too quickly.
...
- Using a translation-based animation duration scheme
- Fixing issue where filtering a task could slide it out of view
Change-Id: Id434b4a98aa671d84d047dad18cbe26f543cdf25
2014-04-04 10:18:24 -07:00
Winson Chung
63eb83f0d6
am b9a7d8c2: Merge "Adding activity icon to the task view"
...
* commit 'b9a7d8c2c46e71f756da69d7682bfc594b2a91ed':
Adding activity icon to the task view
2014-04-03 21:13:40 +00:00
Winson Chung
7631b3ee27
am b9a7d8c2: Merge "Adding activity icon to the task view"
...
* commit 'b9a7d8c2c46e71f756da69d7682bfc594b2a91ed':
Adding activity icon to the task view
2014-04-03 21:11:25 +00:00
Winson Chung
b9a7d8c2c4
Merge "Adding activity icon to the task view"
2014-04-03 21:07:56 +00:00
Jorim Jaggi
18d084698c
resolved conflicts for merge of 93160828 to master-lockscreen-dev
...
Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6
2014-04-03 21:07:39 +02:00
Selim Cinek
1b7525d07e
am 93160828: Merge "Enabled the new notification shade and improved expanding logic"
...
* commit '9316082809196acd126a1e502d4b26d7b5f98216':
Enabled the new notification shade and improved expanding logic
2014-04-03 18:05:22 +00:00
Selim Cinek
b6d85ebfe4
Enabled the new notification shade and improved expanding logic
...
Made the NotificationStackScroller now the default and only shade.
When the notification shade is expanded, the NotificationStackScroller
now also expands revealing the notifications.
Change-Id: If989ed848f684b3ac4e687d9642289db4599553b
2014-04-03 18:59:37 +02:00
Winson Chung
5e3e5d8945
Adding activity icon to the task view
...
- Also fixing issue where the activity icon was being used as the application icon to filter with
2014-04-02 15:44:55 -07:00
Alan Viverette
7dd791f124
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:27 +00:00
Alan Viverette
8246270b53
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:07 +00:00
Alan Viverette
e3c38a0b0e
Fix recents theme, add missing headers
...
Change-Id: Ib8eea6153eaf7e0e93e54c69fe59e63e98a409a6
2014-04-02 15:39:13 -07:00
Alan Viverette
01cefbc5b3
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:23:17 +00:00
Alan Viverette
3a3395042e
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Alan Viverette
b325345ef0
Merge "Switch framework Holo references to Quantum.Light"
2014-04-02 22:15:16 +00:00
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
faa8fb5c77
am 6ac3367d: Merge "Enabling filtering by base intent package."
...
* commit '6ac3367d5df999736470f29a2bbb623864f06d1a':
Enabling filtering by base intent package.
2014-04-01 23:14:38 +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
Alan Viverette
6259933ec9
Switch framework Holo references to Quantum.Light
...
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
2014-04-01 14:57:39 -07:00