Kevin Chyn
db00ff2165
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
am: ffcc25ba92
2019-06-12 15:04:46 -07:00
Kevin Chyn
a142efbf88
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
am: ffcc25ba92
2019-06-12 15:04:28 -07:00
Kevin Chyn
ffcc25ba92
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
* changes:
Make bypass controller consistent with rest of face unlock settings
Move lockscreen bypass setting to Settings > Security > Face unlock
2019-06-12 21:51:42 +00:00
Michael Groover
724a977f8c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: b31b522513
2019-06-12 14:36:59 -07:00
Michael Groover
edef325b20
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: 628d311d0c
2019-06-12 14:33:33 -07:00
Kevin Chyn
d7ec14a5b5
Call finish() when enrollment loses focus
...
am: e9d50cd91b
2019-06-12 14:30:30 -07:00
Michael Groover
98297076ea
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: 628d311d0c
2019-06-12 14:30:10 -07:00
Kevin Chyn
1e325a2153
Call finish() when enrollment loses focus
...
am: e9d50cd91b
2019-06-12 14:28:54 -07:00
Michael Groover
628d311d0c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
2019-06-12 14:20:33 -07:00
Michael Groover
b31b522513
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
2019-06-12 14:17:03 -07:00
Michael Groover
ad85d6b942
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
2019-06-12 20:31:16 +00:00
Kevin Chyn
059980d215
Make bypass controller consistent with rest of face unlock settings
...
1) Should only be shown for owner profile
2) Should be disabled if A) not enrolled, B) DevicePolicyManager, C) HAL issue
Fixes: 134700640
Test: Manual test of conditions above
Change-Id: Id72db59c662df6c529c98aafd610de8c86c77ebd
2019-06-12 13:27:22 -07:00
Kevin Chyn
6a4a0e7396
Move lockscreen bypass setting to Settings > Security > Face unlock
...
Fixes: 134700640
Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display
Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
2019-06-12 13:27:18 -07:00
Kevin Chyn
e9d50cd91b
Call finish() when enrollment loses focus
...
Bug: 134971919
Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works
Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea
2019-06-12 11:05:47 -07:00
android-build-team Robot
4a949c0640
Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release
...
Change-Id: I99e4df5bf4f3ea4e98672611976292174b53f507
2019-06-12 09:56:45 +00:00
Raff Tsai
6183b9b1ac
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f9fa8329b02
2019-06-12 09:55:50 +00:00
Jonathan Scott
a945243b5c
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
...
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
(cherry picked from commit 687b18067c
2019-06-12 09:55:46 +00:00
joshmccloskey
388b26d4d5
Merge "Increased toggling area" into qt-r1-dev
...
am: a854373bee
2019-06-11 22:51:01 -07:00
joshmccloskey
4701f0d364
Merge "Increased toggling area" into qt-r1-dev
...
am: a854373bee
2019-06-11 22:50:59 -07:00
TreeHugger Robot
a854373bee
Merge "Increased toggling area" into qt-r1-dev
2019-06-12 05:40:53 +00:00
android-build-team Robot
67db39667a
Merge "Snap for 5652689 from a621f8a374 to qt-c2f2-release" into qt-c2f2-release
2019-06-12 04:12:25 +00:00
android-build-team Robot
0e82399770
Merge "Snap for 5652689 from a621f8a374 to qt-c2f2-release" into qt-c2f2-release
2019-06-12 04:07:27 +00:00
android-build-team Robot
f6e443d0d5
Merge "Snap for 5652689 from a621f8a374 to qt-c2f2-release" into qt-c2f2-release
2019-06-12 04:06:13 +00:00
android-build-team Robot
7e4bf6be9d
Merge "Snap for 5652689 from a621f8a374 to qt-c2f2-release" into qt-c2f2-release
2019-06-12 04:02:41 +00:00
android-build-team Robot
2ef5d64b3c
Merge "Snap for 5652499 from 2aa94b97c7 to qt-release" into qt-release
2019-06-12 03:48:52 +00:00
android-build-team Robot
67587b0283
Snap for 5652689 from a621f8a374 to qt-c2f2-release
...
Change-Id: I22223851b88d7b3e953f4ff048c4606abb0fb86d
2019-06-12 03:33:45 +00:00
android-build-team Robot
c3d32f0584
Snap for 5652689 from a621f8a374 to qt-c2f2-release
...
Change-Id: Id3bc34aab25d081f6a00419d9d1f5c6fe86844e4
2019-06-12 03:31:07 +00:00
android-build-team Robot
defde60784
Merge "Snap for 5652499 from 2aa94b97c7 to qt-release" into qt-release
2019-06-12 03:28:21 +00:00
android-build-team Robot
85172d3172
Snap for 5652689 from a621f8a374 to qt-c2f2-release
...
Change-Id: I82d7e3b87e788537c50b9326e7f30e6d0781166b
2019-06-12 03:19:05 +00:00
android-build-team Robot
d03e969e93
Snap for 5652499 from 2aa94b97c7 to qt-release
...
Change-Id: I40f55b96a8f66f91edc3f16d2864c1bb5a83b873
2019-06-12 03:17:22 +00:00
android-build-team Robot
44f84a27fd
Snap for 5652499 from 2aa94b97c7 to qt-release
...
Change-Id: If204c82935a358d336b1e6e59c5ee6fc2e55992c
2019-06-12 03:17:05 +00:00
android-build-team Robot
01b63a102e
Snap for 5652689 from a621f8a374 to qt-c2f2-release
...
Change-Id: I0a0a62963a4bb604cf0d97ba9c1fe39e3d4801e6
2019-06-12 03:11:47 +00:00
android-build-team Robot
32d73655ad
Snap for 5652689 from a621f8a374 to qt-c2f2-release
...
Change-Id: If08128f422501a1375f1b5f874dcc07fb17d72cf
2019-06-12 03:06:23 +00:00
android-build-team Robot
57f2322e57
Snap for 5652499 from 2aa94b97c7 to qt-release
...
Change-Id: I7f21207cae35e2cdbaf9c5837a44cbec41d8028a
2019-06-12 03:02:43 +00:00
joshmccloskey
c2cb46782c
Increased toggling area
...
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes: 130398575
Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
2019-06-12 02:57:17 +00:00
Fan Zhang
32ae5db2ee
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: a621f8a374
2019-06-11 14:44:43 -07:00
Fan Zhang
2875010cd0
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: a621f8a374
2019-06-11 14:42:45 -07:00
Fan Zhang
2bbb1bf2e0
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: 2c9bd6707d
2019-06-11 14:42:45 -07:00
Fan Zhang
2c9bd6707d
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
Fan Zhang
a621f8a374
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
TreeHugger Robot
2aa94b97c7
Merge "Update mainline module versions string." into qt-dev
2019-06-11 21:20:12 +00:00
Android Build Merger (Role)
7a952730bd
Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: af8fa25cfd" into qt-r1-dev-plus-aosp
2019-06-11 20:20:05 +00:00
Antony Sargent
f0e3ac6f27
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: 5d186f5346
2019-06-11 13:19:53 -07:00
Antony Sargent
9d1961e074
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: af8fa25cfd
2019-06-11 13:19:51 -07:00
Antony Sargent
bf784da3ba
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: 5d186f5346
2019-06-11 13:19:50 -07:00
Antony Sargent
af8fa25cfd
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
2019-06-11 13:13:52 -07:00
Antony Sargent
5d186f5346
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
2019-06-11 13:12:52 -07:00
TreeHugger Robot
5836158f2e
Merge "Remove on/off toggle for physical SIMs" into qt-dev
2019-06-11 20:06:54 +00:00
Yi Jiang
ecbaa00855
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
2019-06-11 12:28:15 -07:00
Yi Jiang
0c2b7c4281
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
2019-06-11 12:28:15 -07:00
