Brad Ebinger
b2e2d82c53
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a am: 33b1bfb8fb -s ours am: f51dc265a0 -s ours
...
am: 1984bd6d519761dd4634
2019-06-13 14:24:47 -07:00
Brad Ebinger
1984bd6d51
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a am: 33b1bfb8fb -s ours
...
am: f51dc265a09761dd4634
2019-06-13 14:02:41 -07:00
Brad Ebinger
f51dc265a0
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a
...
am: 33b1bfb8fb9761dd4634
2019-06-13 13:52:20 -07:00
Brad Ebinger
33b1bfb8fb
Merge "Allow SimDialogActivity to be started for result"
...
am: 11d92e894a
2019-06-13 13:42:41 -07:00
Brad Ebinger
11d92e894a
Merge "Allow SimDialogActivity to be started for result"
2019-06-13 20:17:19 +00:00
Yiwei Zhang
687906f2f9
Game Driver: Allow user to apply prerelease driver for all apps
...
Currently the global opt-in is only available to Game Driver. This change has
added an option to let developers to opt-in all apps to use prerelease driver.
GameDriverEnableForAllAppsPreferenceController is then refactored from
SwitchPreference to ListPreference to support this change.
Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I6dcb3a22a4033a576605d42aa80b09db088d4aa2
2019-06-13 12:21:49 -07:00
Julia Reynolds
76c59e5b8a
Refresh the whole rule in zen listing screen am: 78ef02eb8f am: 56897c6bfc
...
am: 70af71155d
2019-06-13 11:43:17 -07:00
Julia Reynolds
2ab97e02cd
Refresh the whole rule in zen listing screen am: 78ef02eb8f am: 39bff61eea
...
am: 01be0f85b3
2019-06-13 11:42:55 -07:00
Julia Reynolds
70af71155d
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 56897c6bfc
2019-06-13 11:34:57 -07:00
Julia Reynolds
01be0f85b3
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 39bff61eea
2019-06-13 11:33:23 -07:00
Julia Reynolds
39bff61eea
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
2019-06-13 11:25:22 -07:00
Julia Reynolds
56897c6bfc
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
2019-06-13 11:25:21 -07:00
Julia Reynolds
78ef02eb8f
Refresh the whole rule in zen listing screen
...
Because the whole rule is pushed to NMS when it's
enabled/disabled.
Test: manual
Fixes: 135170330
Change-Id: I4bbc30f82dab07cff9184f9ab8a6f729499c6126
2019-06-13 16:48:22 +00:00
Yiwei Zhang
23ee53b746
Merge "Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: 3b8681d8c6" into qt-r1-dev-plus-aosp
...
am: d7f6cf0691
2019-06-13 09:13:01 -07:00
Yiwei Zhang
ad7e3ee351
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: a05cb731e7
...
am: 9dd8ac1751
2019-06-13 09:10:25 -07:00
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
