Commit Graph

14635 Commits

Author SHA1 Message Date
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Adrian Roos
4ab7e595a5 StrongAuthTracker: Don't rely on USER_PRESENT
USER_PRESENT is sent via the background queue. A delay
there can cause us not to recognize that the user has
unlocked and prompt for the credential again, when trust
or fingerprint would be sufficient.

Also removes an obsolete reference to USER_PRESENT from
TrustManagerService.

Change-Id: Ie8d1a180170df5f0c8f9e71660504fd71eeacd99
Fixes: 27830458
2016-04-13 15:38:18 -07:00
Kaori Katou
8f2d7678a5 Merge "Dismiss keyguard when user button is tapped" into nyc-dev
am: 819b9bc

* commit '819b9bc9dbf31b8b6db999ff56477038ad95ffcf':
  Dismiss keyguard when user button is tapped

Change-Id: I8c88b4067bd58adf66c86f5246ad3674f34784d3
2016-04-13 21:39:10 +00:00
Jorim Jaggi
d79d1ba4bc Refine long-press enter and exit animations
am: 545c5c2

* commit '545c5c20d3b1f424b2f1917a262a5e8130dab6d0':
  Refine long-press enter and exit animations

Change-Id: I229da9faaee36f491ee40ad00fea9273919e71a9
2016-04-13 21:39:08 +00:00
TreeHugger Robot
819b9bc9db Merge "Dismiss keyguard when user button is tapped" into nyc-dev 2016-04-13 21:32:21 +00:00
Jorim Jaggi
545c5c20d3 Refine long-press enter and exit animations
Bug: 27154882
Change-Id: I13a1a6ea7eabdefc7e5c32ae0471d9fa14cc3f86
2016-04-13 21:27:32 +00:00
Jason Monk
856577deed Merge "QS: Add content description to page indicator" into nyc-dev
am: 4db7675

* commit '4db7675d8509039dd9cf5dc7231c5bca6330dcd3':
  QS: Add content description to page indicator

Change-Id: Ibee90a16133577b59c90880b8f591c39bf6f0882
2016-04-13 19:17:33 +00:00
Jason Monk
4db7675d85 Merge "QS: Add content description to page indicator" into nyc-dev 2016-04-13 19:11:22 +00:00
Kaori Katou
ccf08d7c84 Dismiss keyguard when user button is tapped
When multi-user is disabled and user button is tapped
on the keyguard, the contact app is displayed behind the keyguard.
The keyguard should be dismissed when the contact app is launched.

Change-Id: I7daa0bec84b5172e78668cc71e51955f166ede0a
(cherry picked from commit 0a33405329)
2016-04-13 11:05:41 -07:00
Jason Monk
2977ba2cd7 QS: Add content description to page indicator
Change-Id: I4e9bdfe803d681484eb4c8915c44e37be40d8aa2
Fixes: 27325720
2016-04-13 13:01:14 -04:00
Treehugger Robot
a27376d836 Merge "Fix: the label "customize" is not updated after changing language" am: b4c4e20
am: d5be2a2

* commit 'd5be2a2055b8e0f4067f00e8756fdf22c084e94d':
  Fix: the label "customize" is not updated after changing language

Change-Id: I7bc30cf66b76b062468b443fd1ef965386c5761e
2016-04-13 16:36:11 +00:00
Jason Monk
6e8111c5df Merge "Remove color and appearance" into nyc-dev
am: c2e8857

* commit 'c2e8857a284433ea83006349bcba204bdd1897cc':
  Remove color and appearance

Change-Id: I7650274e1c3b4167a699e5697aeabeba1ccc898c
2016-04-13 15:47:13 +00:00
Jason Monk
52c66d74d1 Remove color and appearance
Also fix crash.

Change-Id: I16abec61d63e2d503b07047c08664c2e96689c50
Fixes: 28163234
2016-04-13 11:01:19 -04:00
Treehugger Robot
b4c4e20960 Merge "Fix: the label "customize" is not updated after changing language" 2016-04-13 14:25:05 +00:00
Treehugger Robot
e3d556f785 Merge "Dismiss keyguard when user button is tapped" 2016-04-13 13:32:38 +00:00
Nicolas Prevot
d1261c578e Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev
am: eeef75b

* commit 'eeef75b6266dee8127bb0bcd1c241059602ca791':
  Suspend work status bar icon should be removed when work profile is deleted.

Change-Id: I6bc8d58071b4728e2142febc51120f0d68d88988
2016-04-13 11:07:43 +00:00
Nicolas Prévot
eeef75b626 Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev 2016-04-13 11:00:02 +00:00
Nicolas Prevot
6c7b874557 Suspend work status bar icon should be removed when work profile is deleted.
BUG:26787011
Change-Id: Ifb3de2a670b1d5ac74200b8d344bb576f683ed61
2016-04-13 10:28:58 +01:00
Jorim Jaggi
e203cdefa1 Merge "TRON refinements for multi-window" into nyc-dev
am: a74888d

* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
  TRON refinements for multi-window

Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6 Merge "TRON refinements for multi-window" into nyc-dev 2016-04-13 04:18:31 +00:00
Jaewan Kim
9949ccf785 Merge "PIP: Fix crash in Recents when restrict profile is enabled" into nyc-dev
am: e802c81

* commit 'e802c81fd287fe6e424dacf250f00b9e2d111220':
  PIP: Fix crash in Recents when restrict profile is enabled

Change-Id: Id5a959c9c6f046b20a91095293243d5bf1ff086f
2016-04-13 03:28:43 +00:00
Jaewan Kim
e802c81fd2 Merge "PIP: Fix crash in Recents when restrict profile is enabled" into nyc-dev 2016-04-13 03:25:10 +00:00
Jorim Jaggi
29379ec859 TRON refinements for multi-window
Bug: 26013430
Change-Id: I89b139b4ca3e7b6a06d8b5b351d67ffac240f73f
2016-04-12 19:43:52 -07:00
Jorim Jaggi
fae3f9c5e5 Merge "Add shadow for minimized dock" into nyc-dev
am: a5df489

* commit 'a5df489c9c56b1ac5b0f1acef07454ea438b5367':
  Add shadow for minimized dock

Change-Id: Iab5e97a8a5cb521aadf519359816ff2c48de7e71
2016-04-13 02:33:39 +00:00
Jorim Jaggi
a5df489c9c Merge "Add shadow for minimized dock" into nyc-dev 2016-04-13 02:24:57 +00:00
Jorim Jaggi
2917dc4918 Add shadow for minimized dock
Bug: 27972642
Change-Id: Ic4c8145f61694ff2bb0e237da1142093c6a4d965
2016-04-12 19:17:24 -07:00
Winson
908beb79ef Merge "Fixing issue with larger clip bounds being specified than in the view." into nyc-dev
am: 608f65b

* commit '608f65b1442bc99fd1ee7c9b282217fe428647f1':
  Fixing issue with larger clip bounds being specified than in the view.

Change-Id: I8ae7a983ef8adc7792990026ac8e5cd2cd534018
2016-04-13 01:35:43 +00:00
Winson Chung
608f65b144 Merge "Fixing issue with larger clip bounds being specified than in the view." into nyc-dev 2016-04-13 01:29:06 +00:00
Winson
c406f52446 Fixing issue with larger clip bounds being specified than in the view.
Bug: 28145358
Change-Id: Ic3e1042ace6bde9bfe0c647e038d484fd4a05d9b
2016-04-12 16:41:02 -07:00
Sid Soundararajan
94c6146477 Merge "Have Recents focus second task when launched, if 2 or more tasks are available" into nyc-dev
am: 15986f0

* commit '15986f0900255e1a6adf1ff5efff5e0e8a94476d':
  Have Recents focus second task when launched, if 2 or more tasks are available

Change-Id: Ifcc50fa8e897de63508941028bb0441e8c4a13cd
2016-04-12 22:52:28 +00:00
Sid Soundararajan
15986f0900 Merge "Have Recents focus second task when launched, if 2 or more tasks are available" into nyc-dev 2016-04-12 22:43:49 +00:00
Sid Soundararajan
45e185a35e Merge "Fix issue with All Tasks Dismissed" into nyc-dev
am: 8029554

* commit '80295544c11cefc058e953090354dc4faa17d3c0':
  Fix issue with All Tasks Dismissed

Change-Id: Ic34c320380336916a80d115236cd9220167e2eb4
2016-04-12 22:22:29 +00:00
Jason Monk
3d49099a5c Merge "Hide QS header when in details" into nyc-dev
am: 1b2e403

* commit '1b2e403fca22956dc3b7a3c20142a5e788aa45e4':
  Hide QS header when in details

Change-Id: Id36ac19b4355f9f4835c748d770b9c4edc3ca159
2016-04-12 22:22:03 +00:00
Jason Monk
990fa34598 Merge "Fix QS animation QQS visibility" into nyc-dev
am: 72aefb8

* commit '72aefb8dcebc4e99eea7b2fc26549c8861c384be':
  Fix QS animation QQS visibility

Change-Id: Iba682ab659aa938c8988703df5878c8543bbe966
2016-04-12 22:20:20 +00:00
Jason Monk
6694a574ff Merge "QS animation: fix clearing translation state" into nyc-dev
am: 41ca34f

* commit '41ca34fb3b67b4210096626979335049bb91348a':
  QS animation: fix clearing translation state

Change-Id: I40fa002865714962ccd1607c6d48616e368cfd80
2016-04-12 22:20:10 +00:00
Sid Soundararajan
80295544c1 Merge "Fix issue with All Tasks Dismissed" into nyc-dev 2016-04-12 20:46:15 +00:00
Jason Monk
1b2e403fca Merge "Hide QS header when in details" into nyc-dev 2016-04-12 20:11:10 +00:00
Jason Monk
589bb70a77 Hide QS header when in details
because it gets in the way of accessibility

Change-Id: I4725217e7f5947961339b1cacba73d570e8cb2d9
Fixes: 27953567
2016-04-12 15:44:43 -04:00
Jason Monk
72aefb8dce Merge "Fix QS animation QQS visibility" into nyc-dev 2016-04-12 19:18:38 +00:00
Jason Monk
41ca34fb3b Merge "QS animation: fix clearing translation state" into nyc-dev 2016-04-12 19:18:28 +00:00
Jason Monk
26fe261537 Merge "The return and fixing of demo mode" into nyc-dev
am: 8af20ef

* commit '8af20ef6a885a50694805a066f02fc643e80b837':
  The return and fixing of demo mode

Change-Id: I34d6d6dba5797b926a9ce61bd9670ea910f3e7b7
2016-04-12 19:06:09 +00:00
Jorim Jaggi
74ec47b62e Refine exit animation
am: 47ee9ad

* commit '47ee9ad92c2b82a93e2d99d82d5c2591edd9086d':
  Refine exit animation

Change-Id: Ia0a42e3a5157be994c1d5860e21249abf358a7bb
2016-04-12 18:53:59 +00:00
Winson
40ebb466be Merge "Fixing issue with scrolling tasks upwards" into nyc-dev
am: 59d2a903

* commit '59d2a90358151a39f47c6914cb994252aef7de37':
  Fixing issue with scrolling tasks upwards

Change-Id: Id69ccf50bf44eb5bc4b3fbd9994e444b9135a94a
2016-04-12 18:53:57 +00:00
Jorim Jaggi
962f40c63b Fix some serious pre draw listener leaks
am: 38b5ec9

* commit '38b5ec9f081e60e860dcd7a7701d20ce06261133':
  Fix some serious pre draw listener leaks

Change-Id: Icf3cec347126b6541b71a76bfd263a41cb59bf56
2016-04-12 18:53:52 +00:00
Jason Monk
8af20ef6a8 Merge "The return and fixing of demo mode" into nyc-dev 2016-04-12 18:53:20 +00:00
Jason Monk
5737ef3ab0 Fix QS animation QQS visibility
once and for all?

Change-Id: I25807a77097ca10410fdc388333946a6ea2e7a7b
Fixes: 27536311
2016-04-12 14:35:13 -04:00
Jorim Jaggi
47ee9ad92c Refine exit animation
Don't move the other stack when exiting multi-window with undock
gesture.

Bug: 27154882
Change-Id: Ia2793d2e2b16def543289f8b2b13631db90edca8
2016-04-12 18:11:23 +00:00
Winson Chung
59d2a90358 Merge "Fixing issue with scrolling tasks upwards" into nyc-dev 2016-04-12 18:11:17 +00:00
Winson
da8d2285e5 Fixing issue with scrolling tasks upwards
- When scrolling the stack away from the task overrides, we should 
  actually lock the stack scroll and instead apply the changes in scroll
  to the override tasks.

Bug: 27376567
Change-Id: Idd1874ab0f6f5eb273bf6e9623b84277961f4291
2016-04-12 18:05:28 +00:00