Selim Cinek
eb03710936
Merge "Fix breaking test" into qt-r1-dev
...
am: dc40ca591f
Change-Id: I17fbdab3aea1f1c6f9ab771f7e476ba87cb2b121
2019-07-23 21:43:51 -07:00
Winson Chung
ea9527d31f
Merge "Proxy search disabled flag to Launcher" into qt-r1-dev
...
am: 6d4d529fb1
Change-Id: I680097d99903a8e3b608ab02798edda0f0ecc56e
2019-07-23 21:28:37 -07:00
bsears
8473cc1e55
[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e -s ours
...
am: c7067c4d5d -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: I94ef481f11bdc60c3e0b91b036741acd522adccc
2019-07-23 21:21:44 -07:00
Selim Cinek
dc40ca591f
Merge "Fix breaking test" into qt-r1-dev
2019-07-24 04:15:53 +00:00
Jorim Jaggi
c53bcfea03
[automerger skipped] Merge "Mark screen rotation as early (1/2)" into qt-dev am: 7b4bbe003d
...
am: 25fde4b0ba -s ours
am skip reason: change_id If0b4428253dbfa4dcb102b8146a847e2e9ab876b with SHA1 4e0300db40 is in history
Change-Id: Ibb3b8b72dc8244a20cf4a2995c4c0a6d6b885f34
2019-07-23 20:58:04 -07:00
Lucas Dupin
848dd31aea
Merge "Bouncer isn't in transit when fully visible/hidden" into qt-r1-dev
...
am: c2877e1197
Change-Id: I4886a6926304f84dc32026a609f9bd5471d57235
2019-07-23 20:55:11 -07:00
Lucas Dupin
1702308f0c
Merge "Isolate DPM and SIM PIN states from UX" into qt-r1-dev
...
am: 428385c40e
Change-Id: I9972d8924e1ba287d36d77e99b5bf9710f91e270
2019-07-23 20:54:35 -07:00
Selim Cinek
e10fec5ede
Merge "Fixed the behavior when dragging down on home screen with a hun" into qt-r1-dev
...
am: 201d00ed14
Change-Id: Idfca948d5726ce2bb3fc59d88a40bd35b62ae116
2019-07-23 20:49:58 -07:00
TreeHugger Robot
6d4d529fb1
Merge "Proxy search disabled flag to Launcher" into qt-r1-dev
2019-07-24 01:58:24 +00:00
bsears
88c506fd14
[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e
...
am: 8cd2973a9f -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: Ica34780e45dd46847182a4f758244e3285993e12
2019-07-23 18:51:00 -07:00
Lucas Dupin
5431a92fd5
Fix breaking test
...
Fixes: 138245190
Test: atest SystemUITests
Merged-In: Ic1a937d3d81f4386ae744109076935921da9591b
Change-Id: Ie6f1133cac2e0f4f73a3620c71bd0c44d3b9be0b
2019-07-24 01:42:06 +00:00
Jorim Jaggi
ae8a9b971f
Merge "Mark screen rotation as early (1/2)" into qt-dev am: 7b4bbe003d
...
am: 0331768454
Change-Id: Ib094fc80c533af7e76f32949ba57858de22ff462
2019-07-23 18:41:50 -07:00
bsears
8cd2973a9f
Merge "Don't animate clock when turning screen off." into qt-dev
...
am: 486503c74e
Change-Id: I18e2ce288e3b7d848a89e440b9fcd0ded1c3ab0d
2019-07-23 18:41:49 -07:00
bsears
c7067c4d5d
[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev
...
am: 486503c74e -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: I8589586a14b38b70491641f545a31605467f34bd
2019-07-23 18:41:44 -07:00
Jorim Jaggi
0331768454
Merge "Mark screen rotation as early (1/2)" into qt-dev
...
am: 7b4bbe003d
Change-Id: I7847fe7c9bd7c5b05db00fad053ccf51eac5d258
2019-07-23 18:33:53 -07:00
Jorim Jaggi
25fde4b0ba
Merge "Mark screen rotation as early (1/2)" into qt-dev
...
am: 7b4bbe003d
Change-Id: Ie053403cfe588ce0eee30bee8ec1d87c2bf6baeb
2019-07-23 18:33:52 -07:00
bsears
486503c74e
Merge "Don't animate clock when turning screen off." into qt-dev
2019-07-24 01:22:21 +00:00
Lucas Dupin
c2877e1197
Merge "Bouncer isn't in transit when fully visible/hidden" into qt-r1-dev
2019-07-24 01:18:38 +00:00
Lucas Dupin
428385c40e
Merge "Isolate DPM and SIM PIN states from UX" into qt-r1-dev
2019-07-24 01:15:39 +00:00
TreeHugger Robot
201d00ed14
Merge "Fixed the behavior when dragging down on home screen with a hun" into qt-r1-dev
2019-07-24 01:07:36 +00:00
TreeHugger Robot
7b4bbe003d
Merge "Mark screen rotation as early (1/2)" into qt-dev
2019-07-24 01:05:37 +00:00
Dmitry Dementyev
0aa504ec23
Merge "Tell KeyStore to ignore caller uid for PlatformKeyManager's keys." into qt-r1-dev
...
am: f7ed4da59c
Change-Id: I8dfb9dcd0952058e0da6518a8868bb2257e58749
2019-07-23 16:43:23 -07:00
Dmitry Dementyev
f7ed4da59c
Merge "Tell KeyStore to ignore caller uid for PlatformKeyManager's keys." into qt-r1-dev
2019-07-23 23:24:28 +00:00
Winson Chung
cb6454e68a
Proxy search disabled flag to Launcher
...
Bug: 137652372
Test: Just adding a flag
Change-Id: Ib1936dc0d2eed02bc2ef0dd7e091cbc4fa7af682
2019-07-23 15:55:10 -07:00
Jorim Jaggi
4e0300db40
Mark screen rotation as early (1/2)
...
To decrease jank while rotating.
Test: Rotate screen
Bug: 138083790
Change-Id: If0b4428253dbfa4dcb102b8146a847e2e9ab876b
Merged-In: If0b4428253dbfa4dcb102b8146a847e2e9ab876b
2019-07-23 22:43:48 +00:00
Hai Zhang
5534e979ed
Merge "DO NOT MERGE Set app op mode to allowed when granting permissions to reset state." into qt-r1-dev
...
am: 21de89ccc6
Change-Id: I1949b9ab38ec13878af69ae504dd84928c3e52b1
2019-07-23 15:20:09 -07:00
Hai Zhang
c7643aad8f
DO NOT MERGE Set app op mode to allowed when granting permissions to reset state.
...
am: ac743cb54e
Change-Id: I9397282cb95a37ae064bf1a7b3dfff39764d18b6
2019-07-23 15:20:04 -07:00
Bill Yi
8939af9ab9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 9b5cfc03b0 -s ours
am skip reason: subject contains skip directive
Change-Id: I31345146c681b1caededa5de6dcb231324e8e3f9
2019-07-23 15:14:18 -07:00
Selim Cinek
aae9ad6770
Fixed the behavior when dragging down on home screen with a hun
...
Previously the headsupmanager wouldn't be informed about the update
and touches would not necessarily go through to the panelView
because we were still considered small.
Fixes: 138152555
Test: drag down on home while a hun is showing
Change-Id: I1d28e3df8ccac297a65424fe1c9401968a364ee6
2019-07-23 14:53:16 -07:00
TreeHugger Robot
21de89ccc6
Merge "DO NOT MERGE Set app op mode to allowed when granting permissions to reset state." into qt-r1-dev
2019-07-23 21:52:30 +00:00
TreeHugger Robot
9b5cfc03b0
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-23 21:43:49 +00:00
Bill Yi
99a1032994
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 85a56ba185 -s ours
am skip reason: subject contains skip directive
Change-Id: I861e9b959fc32790c1f4ecff0ce47c24bfac1b71
2019-07-23 14:42:14 -07:00
Lucas Dupin
273832d6ac
Bouncer isn't in transit when fully visible/hidden
...
Test: atest KeyguardBouncerTest
Test: tap screen when unlocking without bypass mode
Fixes: 138125943
Change-Id: I9d2b58aebf42fc0d3ff3e39e97cb8734b3bbed71
2019-07-23 14:39:46 -07:00
TreeHugger Robot
85a56ba185
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-23 21:20:08 +00:00
Selim Cinek
0a6795fee2
Merge "Improved the heads up experience when notifications were blocked" into qt-r1-dev
...
am: fc039930d1
Change-Id: Id9238aa220d40c2bd4405b35a889e6e78391fc10
2019-07-23 13:46:30 -07:00
Patrick Baumann
6bd2dfad1e
Merge "Don't unfreeze too early" into qt-r1-dev
...
am: 31c862e17e
Change-Id: Id9b072da32aada717753b0b4066e6a05df023035
2019-07-23 13:42:00 -07:00
Ryan Prichard
3b827e107a
Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a1648c
...
am: 6c05510d86
Change-Id: Ibe8bb89f39082f73f3a4e7bdcf34ebdf5dc2f2b6
2019-07-23 13:33:03 -07:00
Lucas Dupin
4c50704670
Isolate DPM and SIM PIN states from UX
...
User should still be able to swipe up to retry or still see
the bypass lock screen when face auth is disabled or sim
card is locked. Having different UX on those cases is
confusing.
Bug: 138125943
Change-Id: Iece4d28e7a988af846c9e8aa9eb0fff5a1d74249
2019-07-23 13:30:22 -07:00
Selim Cinek
fc039930d1
Merge "Improved the heads up experience when notifications were blocked" into qt-r1-dev
2019-07-23 20:25:35 +00:00
Dmitry Dementyev
80f5f1bfc3
Tell KeyStore to ignore caller uid for PlatformKeyManager's keys.
...
Without the change, keys created for secondary profiles are still bound
to the primary profile lock screen secret.
Test: manual
Bug: 129845209
Change-Id: I7e180656f8dc81f5c05036a7e8c810c9582f8f82
2019-07-23 20:24:30 +00:00
TreeHugger Robot
31c862e17e
Merge "Don't unfreeze too early" into qt-r1-dev
2019-07-23 20:22:34 +00:00
Hai Zhang
ac743cb54e
DO NOT MERGE Set app op mode to allowed when granting permissions to reset state.
...
We grant GRANTED_BY_DEFAULT permissions again when user clears data
for a package to reset its state, but the app op mode needs to be
granted as well.
Fixes: 137723522
Test: presubmit & manual
Change-Id: Ibbbbff9e5d8161538637a4c542d7c0bc92a90501
2019-07-23 20:17:51 +00:00
Ryan Prichard
6c05510d86
Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master
...
am: 4657a1648c
Change-Id: Ib8079a3cc7367db10806da5bab80f402530ce8a7
2019-07-23 13:15:19 -07:00
Bill Yi
cca78a72f8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ef7742eaa85199f18abe62e7b122eee9a8bc27e
2019-07-23 13:09:00 -07:00
Bill Yi
9977f99aa5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icda8f9f62161a32ea41f73e62d74feb8e14afc72
2019-07-23 13:05:07 -07:00
Ryan Prichard
4657a1648c
Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master
2019-07-23 19:36:12 +00:00
Robert Snoeberger
0fd34eb404
Merge "Don't animate clock when turning screen off." into qt-r1-dev
...
am: cc52759d2c
Change-Id: I9c7ac6abb9dc4f5222f2c429b35615ea18028cab
2019-07-23 11:30:21 -07:00
Robert Snoeberger
c51bb548dc
Don't animate clock when turning screen off.
...
This change stops the animation because there isn't a
transition from the no-header state to the music header
state when turning the screen off (to AOD). Since there
isn't a transition, there isn't an animation.
This assumes that there isn't a transition from unlocked to
lock screen. If there is, then there would be an animation
of the music going away while arriving at the lock screen.
Fixes: 137383007
Test: Checked repro steps in bug, clock doesn't animate.
Test: Also checked repro steps when audio is paused, clock doesn't
animate.
Test: atest KeyguardSliceProviderTest.java
Change-Id: If39777340b72bc623d6690bc4f784c7f5c26ea8d
Merged-In: If39777340b72bc623d6690bc4f784c7f5c26ea8d
2019-07-23 18:13:13 +00:00
Robert Snoeberger
cc52759d2c
Merge "Don't animate clock when turning screen off." into qt-r1-dev
2019-07-23 18:12:40 +00:00
Hai Zhang
e702245d85
Merge "Fix permission javadoc about whitelisting." into qt-dev am: 4918e711d3
...
am: 0eb65bc268
Change-Id: I6ecf316567e3ce0203ea9cf7ff8ffaea28e1a2ed
2019-07-23 11:11:30 -07:00