Commit Graph

59521 Commits

Author SHA1 Message Date
Yiwei Zhang
aab44f2cd1 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
am: 3b8681d8c6

Change-Id: Ibe0f46e3bf763e99b7c818a0213fe50d04a3aa9b
2019-06-13 08:52:40 -07:00
Yiwei Zhang
3b8681d8c6 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am: 0de0d5be39

Change-Id: Ib806945a955125febf2d7eb8c37e735c9e2ade0d
2019-06-13 08:46:47 -07:00
Yiwei Zhang
a05cb731e7 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am: 0de0d5be39

Change-Id: I16a67e516ff20ec1aa38aa83d11c433e82299597
2019-06-13 08:45:42 -07:00
TreeHugger Robot
0de0d5be39 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev 2019-06-13 15:38:54 +00:00
TreeHugger Robot
3075023d2a Merge "Fix double divider in Apps & notifications page" 2019-06-13 13:38:32 +00:00
tmfang
24c3324268 Use FooterPreference in xml explicitly
We don't rely on FooterPreferenceMixinCompat
to create footer preference in dashboard fragment.

Instead, declare a FooterPreference explicitly in
xml of screen.

It makes more sense for our referenceController design.

Test: visual, robotest
Bug: 124129485
Change-Id: I0b0c0f9e38d85aa89b815ce2b84ddff30a1d206b
2019-06-13 18:29:37 +08:00
Jason Chiu
cfa36dbaeb Fix double divider in Apps & notifications page
- The second divider is shown after we set a background to the pinned
  header.
- Fix it by simply hiding the pinned header instead of its inner views.

Fixes: 133231218
Test: robotest, visual
Change-Id: I53add6f01930299425ce96d23350f9f066e85145
2019-06-13 18:23:37 +08:00
Sunny Shao
5da24591ea Update testcases which failed due to the SupportLibrary changed
Fragment.oncreate() causes an IllegalStateException. We use a
ShadowFragment to stop the calling sequence.

Fixes: 135086559
Test: robotest
Change-Id: I601e0f2513f826b0b7749cb2c013b7e4c0a94a33
2019-06-13 10:02:50 +00:00
TreeHugger Robot
ff89b713b7 Merge "Migrate VirtualKeyboardFragment to DashboardFragment" 2019-06-13 08:35:30 +00:00
Arc Wang
d2dc5438fa [Wi-Fi DPP] Improve Wi-Fi QR code error messages
Give all failures of Wi-Fi QR code format or data problem
with a correct error message.

Bug: 134033509
Test: manual visual
Change-Id: I5259d0d68e47d00a69e3e8107697605f3f187203
2019-06-13 16:24:14 +08:00
Arc Wang
838cbbf539 [Wi-Fi DPP] Remove scanner button of unsaved WiFi network dialogs
Romove it because we may not ensure the network of a QR code is
matching the selected one.

Bug: 134701332
Test: manual visual
Change-Id: I264e921c806f2b335d158fc4cffc48acf69f5c19
2019-06-13 16:17:03 +08:00
Raff Tsai
74942cee5e Migrate VirtualKeyboardFragment to DashboardFragment
Fixes: 134451794
Test: robolectric
Change-Id: I2a40090178b3daea894bdad570549c7bfa34e4e6
2019-06-13 15:17:00 +08:00
Kevin Yao
f1c0f23510 Merge "Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: 2bff53a21e" into qt-r1-dev-plus-aosp
am: 570124c7bd

Change-Id: Ia3a9b4258ec53e4fbb40f8c52f3cf9717fe6861f
2019-06-12 21:56:55 -07:00
Kevin Yao
697d261c2b Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: e6ae9219ce
am: 96a8cd4ef6

Change-Id: I37de163f9c03b9a6224b289a8a8b88fbab60b280
2019-06-12 21:56:33 -07:00
Android Build Merger (Role)
570124c7bd Merge "Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: 2bff53a21e" into qt-r1-dev-plus-aosp 2019-06-13 04:52:17 +00:00
Kevin Yao
34bce74a91 Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
am: 2bff53a21e

Change-Id: Ibb387aa5b515c9b99a9c9ad1dc29b45ae186d140
2019-06-12 21:52:05 -07:00
Kevin Yao
270da81a36 Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
am: 2bff53a21e

Change-Id: I2d25f7f131d174b8f942b1f8e233b9afca59d353
2019-06-12 21:52:04 -07:00
Kevin Yao
96a8cd4ef6 Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
am: e6ae9219ce

Change-Id: I7cca7c8fb1970861726c9fa9d0dc7db5fef8edc6
2019-06-12 21:52:03 -07:00
Kevin Yao
2bff53a21e Merge "Fix typo for Accessibility permission dialog" into qt-dev
am: e78e4dc6f2

Change-Id: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
2019-06-12 21:47:04 -07:00
Kevin Yao
e6ae9219ce Merge "Fix typo for Accessibility permission dialog" into qt-dev
am: e78e4dc6f2

Change-Id: Ia3292d11926a24e9e907c71b5d85bf97a062a066
2019-06-12 21:47:04 -07:00
TreeHugger Robot
e78e4dc6f2 Merge "Fix typo for Accessibility permission dialog" into qt-dev 2019-06-13 04:30:26 +00:00
android-build-team Robot
ee8fc65d29 Snap for 5656475 from ad85d6b942 to qt-release
Change-Id: Id30ba6d2f7b98024b54c2e2aef574e264c6f37be
2019-06-13 03:11:33 +00:00
android-build-team Robot
21572ed3b2 Snap for 5656431 from ffcc25ba92 to qt-qpr1-release
Change-Id: Id5d7d97485fc8c8ae59fc72f9b943747c5d823b5
2019-06-13 03:01:09 +00:00
Yiwei Zhang
240760c570 Game Driver: Add UI support for prerelease Game Driver
Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I9c710a5e6adff9b01c656d576f53f9b4b3360207
2019-06-12 18:09:36 -07:00
Kevin Chyn
64fec889df Merge changes from topic "face-bypass-move" into qt-r1-dev am: ffcc25ba92
am: db00ff2165

Change-Id: I9a93753fd094d8a3634c17e18c8b1900d4632312
2019-06-12 15:19:24 -07:00
Kevin Chyn
db00ff2165 Merge changes from topic "face-bypass-move" into qt-r1-dev
am: ffcc25ba92

Change-Id: I787f5858cefad29869bcae364a0b1f1a4aa9cc4c
2019-06-12 15:04:46 -07:00
Kevin Chyn
a142efbf88 Merge changes from topic "face-bypass-move" into qt-r1-dev
am: ffcc25ba92

Change-Id: I1e1c7e3d92f404337fcfb04d6e3187110a7e503e
2019-06-12 15:04:28 -07:00
Michael Groover
ed1d864f31 Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: b31b522513
am: 724a977f8c

Change-Id: I51fb1404863db0988c3e3a80013bdcb762b32c66
2019-06-12 14:58:52 -07:00
Michael Groover
d207e7a4ca Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: 628d311d0c
am: edef325b20

Change-Id: I4b6d164ac33975e1c31ae19ffa427a26eeab4925
2019-06-12 14:56:13 -07:00
Kevin Chyn
fffc309491 Call finish() when enrollment loses focus am: e9d50cd91b
am: d7ec14a5b5

Change-Id: I44f1df3f1692f008e8a5251715bc341e3dae169e
2019-06-12 14:55:25 -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

Change-Id: Iecf9903356794b13ce628843d0dfda821d6305d3
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

Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd
2019-06-12 14:33:33 -07:00
Kevin Chyn
d7ec14a5b5 Call finish() when enrollment loses focus
am: e9d50cd91b

Change-Id: Ic48cdf5e244689481b8b53af5b55b4b316dc5c56
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

Change-Id: Id98a50fd86e33bb5b2e04a3bed959e01bc033ec2
2019-06-12 14:30:10 -07:00
Kevin Chyn
1e325a2153 Call finish() when enrollment loses focus
am: e9d50cd91b

Change-Id: Ie9681295f74b40d8aa03ff6ba7e047a61ae6a952
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

Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
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

Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3
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
TreeHugger Robot
7855c640c7 Merge "Fix launching of work profile notif settings" 2019-06-12 17:44:14 +00:00
Julia Reynolds
142920e0c2 Fix launching of work profile notif settings
Test: manual
Fixes: 132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
2019-06-12 11:39:39 -04: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 fe86a2a51f)
(cherry picked from commit 9fa8329b02)
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
c528013b8c Merge "Increased toggling area" into qt-r1-dev am: a854373bee
am: 388b26d4d5

Change-Id: I8deab601444497676d929704637613ab824d19e4
2019-06-11 22:56:01 -07:00
joshmccloskey
388b26d4d5 Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2
2019-06-11 22:51:01 -07:00
joshmccloskey
4701f0d364 Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I0861cf24ce165312ab7419f09834feb060bd2532
2019-06-11 22:50:59 -07:00