Commit Graph

4339 Commits

Author SHA1 Message Date
Jorim Jaggi
e4f49cdf2e am e0fa592a: Merge "Show enter PIN/PUK before notifications on Keyguard."
* commit 'e0fa592afc163708d7707158ff76ee8148d90e79':
  Show enter PIN/PUK before notifications on Keyguard.
2014-04-16 21:58:54 +00:00
Jorim Jaggi
e0fa592afc Merge "Show enter PIN/PUK before notifications on Keyguard." 2014-04-16 21:55:41 +00:00
Dan Sandler
de16234b55 am a46ceb58: Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."
* commit 'a46ceb5881ba9d0efc422713455900f06dce4537':
  Fix NPE if showKeyguard() is not called before hideKeyguard().
2014-04-16 20:37:11 +00:00
Dan Sandler
a46ceb5881 Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." 2014-04-16 20:32:58 +00:00
Dan Sandler
63e40170f8 Fix NPE if showKeyguard() is not called before hideKeyguard().
Bug: 14112212
Change-Id: Iced1085cf7be8d827cf7e34efe603a399f456c1b
2014-04-16 16:22:56 -04:00
Jorim Jaggi
a005f1b685 Show enter PIN/PUK before notifications on Keyguard.
Change-Id: Icec12a43487fe76378e10bb8aaaa163c53b69075
2014-04-16 21:15:59 +02:00
Christoph Studer
a67e648f3e am 97096fd0: Merge "Write eventlog entries for notification visibility"
* commit '97096fd0e64d5cdce3e24139ed6b13cc76c5047e':
  Write eventlog entries for notification visibility
2014-04-16 15:54:18 +00:00
Christoph Studer
97096fd0e6 Merge "Write eventlog entries for notification visibility" 2014-04-16 15:49:54 +00:00
Baligh Uddin
cf8aed657b Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:20 +00:00
Christoph Studer
92b389da2a Write eventlog entries for notification visibility
Keep track of notifications shown in the notification panel
and log them via eventlog.

Added the following eventlog tag:
  * notification_visibility_changed

Bug: 13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
2014-04-16 17:07:49 +02:00
John Spurlock
fdf11f2dfa am 14a6d682: Merge "Migrate away from @hidden onViewAdded."
* commit '14a6d6826cc6253ecd036281a0ede597c8b5bf75':
  Migrate away from @hidden onViewAdded.
2014-04-15 16:47:47 +00:00
John Spurlock
14a6d6826c Merge "Migrate away from @hidden onViewAdded." 2014-04-15 16:44:01 +00:00
John Spurlock
584caa5fab Migrate away from @hidden onViewAdded.
Change-Id: Id8c1c05a2fdeb0776a3d70e67990da1e8e93b18a
2014-04-15 12:40:13 -04:00
Jorim Jaggi
c114d8b837 am c5dc0d0c: Zoom notifications on lockscreen after tapping.
* commit 'c5dc0d0cce373fbf292e13633c114a431d747167':
  Zoom notifications on lockscreen after tapping.
2014-04-15 16:00:28 +00:00
Jorim Jaggi
c5dc0d0cce Zoom notifications on lockscreen after tapping.
For the double tap interaction, this change introduces a new cue
that the notifications must be double-tapped: With the first tap,
the tapped notifications gets larger and the others fade out a bit.

Change-Id: Ib48ff0291aee1a5ec083b9e7ed1021bc420514cf
2014-04-15 17:04:49 +02:00
Jorim Jaggi
496eab866d am d374879b: Merge "Set background of legacy custom notifications views to dark."
* commit 'd374879b1e483cefd49e76fe6022a96fb80116e2':
  Set background of legacy custom notifications views to dark.
2014-04-15 14:03:10 +00:00
Jorim Jaggi
4673985b75 Set background of legacy custom notifications views to dark.
Change-Id: Ifa0c68386eb84b2a83e4e88efda32ad75f28ea77
2014-04-15 09:58:24 +02:00
Winson Chung
1245a5c739 am d2356321: Merge "Adding stack dimming."
* commit 'd2356321aaa28edae6e42f50da128283c2247e37':
  Adding stack dimming.
2014-04-15 02:02:06 +00:00
Winson Chung
1492646b79 Adding stack dimming.
- Fixing case where the window scrim was always dark after loading recents with no tasks.
- Restoring rounded task rects and square aspect landscape tasks
2014-04-14 18:57:14 -07:00
Winson Chung
d81c4b5441 am 0856c467: Merge "Adding experiment for app-info pane."
* commit '0856c46769edeebe2def40d1a3275c9753228a66':
  Adding experiment for app-info pane.
2014-04-14 21:15:58 +00:00
Winson Chung
9f9679d91e Adding experiment for app-info pane.
Change-Id: I647de1a71a2ac82da0a4f8a24125496dd5457441
2014-04-14 12:38:47 -07:00
Evan Charlton
8c6d9e544e resolved conflicts for merge of 352e1082 to master-nova
Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16
2014-04-14 11:53:39 -07:00
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
24e2e6674d Merge "Clean up VolumePanel, tweak volume & brightness dialog styling" 2014-04-11 23:01:11 +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
fe5fffd33b Fix incoming phone calls on lockscreen.
Change-Id: I5a142fb51052c48bd4db76a1be2abf5584668d0e
2014-04-11 21:13:28 +00:00
Winson Chung
ce6701d6f4 am f5bcd887: Merge "Refactoring filter animation logic."
* commit 'f5bcd8876e54aea8f228266ded5d9de8e6cad821':
  Refactoring filter animation logic.
2014-04-11 18:44:37 +00:00
Winson Chung
330e341430 am f5bcd887: Merge "Refactoring filter animation logic."
* commit 'f5bcd8876e54aea8f228266ded5d9de8e6cad821':
  Refactoring filter animation logic.
2014-04-11 18:41:02 +00:00
Winson Chung
11ca76a53c Refactoring filter animation logic.
Change-Id: Ic3b57f540da8fa0d2703eef34c43ed9e54f85021
2014-04-11 11:36:03 -07:00
Jorim Jaggi
68499c8e45 Merge "Change scrim on lockscreen and transparency of cards a bit." into master-lockscreen-dev 2014-04-11 17:55:05 +00: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
Jorim Jaggi
84d2230f10 Clean up log which made it accidentially into the build.
Change-Id: I404b3b3e2020c466cbdbacd8335895cd9693281a
2014-04-11 15:13:39 +00:00
Amith Yamasani
c5ae5c79d2 am c095ca1c: Merge "Corp badging for Recents"
* commit 'c095ca1cb8877121f768b5b6940e4025e810d4ba':
  Corp badging for Recents
2014-04-11 00:35:57 +00:00
Amith Yamasani
f781a9b6d8 am c095ca1c: Merge "Corp badging for Recents"
* commit 'c095ca1cb8877121f768b5b6940e4025e810d4ba':
  Corp badging for Recents
2014-04-11 00:33:44 +00:00
Amith Yamasani
c095ca1cb8 Merge "Corp badging for Recents" 2014-04-11 00:30:35 +00:00
Amith Yamasani
4f0a49e6b9 Corp badging for Recents
Badge apps that belong to the corp profile when shown in the recents list.

Add a userId to TaskKey to help with caching.

Bug: 11676348

Change-Id: I92c8262dce763de89497977fcc6a53899afda136
2014-04-10 17:27:12 -07: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
Jorim Jaggi
262ef08eba Merge "Hide back button on keyguard and make it work for bouncer." into master-lockscreen-dev 2014-04-10 23:06:25 +00:00
Jorim Jaggi
9f347ae27c Fix first child handling with GONE children.
Bug: 13635952
Change-Id: I970f39a2a33d957f32d3290999fd007f0d323b3b
2014-04-11 00:47:18 +02:00
Jorim Jaggi
584a7aa62c resolved conflicts for merge of ff0978fd to master-lockscreen-dev
Change-Id: I03881da30db8189005d50812e5528ed07cebd437
2014-04-10 23:34:07 +02:00
Selim Cinek
fc1c0d1833 am ff0978fd: Merge "Further improved NotificationStackScroller"
* commit 'ff0978fd162d1211007c8345bd1ea641fa2b0e33':
  Further improved NotificationStackScroller
2014-04-10 21:06:38 +00:00
Adrian Roos
0c5c18a2be Merge "Implement camera affordance" into master-lockscreen-dev 2014-04-10 19:43:41 +00:00
Selim Cinek
1685e634fb Further improved NotificationStackScroller
The top card is now collapsed during the pulldown of
the notification shade and expanded during the transition.
The scrollstate is also reset once the shade is closed.

Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
2014-04-10 21:37:46 +02:00
Jorim Jaggi
e5c7a89463 Hide back button on keyguard and make it work for bouncer.
Bug: 13635952
Change-Id: Ie9824dd9926c9deb0a38c8e0a6161f605a489622
2014-04-10 21:10:22 +02:00