Android Build Merger (Role)
d7f6cf0691
Merge "Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: 3b8681d8c6" into qt-r1-dev-plus-aosp
2019-06-13 15:53:56 +00:00
Yiwei Zhang
9dd8ac1751
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: a05cb731e7
2019-06-13 08:52:43 -07:00
Yiwei Zhang
aab44f2cd1
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: 3b8681d8c6
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
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
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
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
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
2019-06-12 21:52:05 -07:00
Kevin Yao
96a8cd4ef6
Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
...
am: e6ae9219ce
2019-06-12 21:52:03 -07:00
Kevin Yao
e6ae9219ce
Merge "Fix typo for Accessibility permission dialog" into qt-dev
...
am: e78e4dc6f2
2019-06-12 21:47:04 -07:00
Kevin Yao
2bff53a21e
Merge "Fix typo for Accessibility permission dialog" into qt-dev
...
am: e78e4dc6f2
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
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
2019-06-12 15:19:24 -07:00
Kevin Chyn
db00ff2165
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
am: ffcc25ba92
2019-06-12 15:04:46 -07:00
Michael Groover
ed1d864f31
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: b31b522513
...
am: 724a977f8c
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
2019-06-12 14:56:13 -07:00
Kevin Chyn
fffc309491
Call finish() when enrollment loses focus am: e9d50cd91b
...
am: d7ec14a5b5
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
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
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
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
joshmccloskey
c528013b8c
Merge "Increased toggling area" into qt-r1-dev am: a854373bee
...
am: 388b26d4d5
2019-06-11 22:56:01 -07:00
joshmccloskey
388b26d4d5
Merge "Increased toggling area" into qt-r1-dev
...
am: a854373bee
2019-06-11 22:51:01 -07:00
TreeHugger Robot
a854373bee
Merge "Increased toggling area" into qt-r1-dev
2019-06-12 05:40:53 +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
3480ab1cbd
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: a621f8a374
...
am: 32ae5db2ee
2019-06-11 14:48:07 -07:00
Fan Zhang
33caf61878
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: 2c9bd6707d
...
am: 2bbb1bf2e0
2019-06-11 14:47:44 -07: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
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
