Antony Sargent
ad01ee4505
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: 24ebff2ff3
2019-06-13 16:58:43 -07:00
Yiwei Zhang
16eef18cb8
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
...
am: 4af74dd86d
2019-06-13 16:50:38 -07:00
Antony Sargent
edcd8e9ca5
Merge "Fix Calls/SMS default SIM selector" into qt-dev
...
am: 7af299c604
2019-06-13 16:49:16 -07:00
Antony Sargent
24ebff2ff3
Merge "Fix Calls/SMS default SIM selector" into qt-dev
...
am: 7af299c604
2019-06-13 16:48:19 -07:00
TreeHugger Robot
4af74dd86d
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
2019-06-13 23:44:36 +00:00
TreeHugger Robot
7af299c604
Merge "Fix Calls/SMS default SIM selector" into qt-dev
2019-06-13 23:25:04 +00:00
Antony Sargent
22b827db55
Fix Calls/SMS default SIM selector
...
In cases where a SIM is initially disabled, even after you turn it on
the ListPreference's for selecting the default SIM for Calls and SMS
weren't working because the preference change listener wasn't getting
registered. This CL fixes that for these controllers by always
registering a change listener whenever we make the preference visible.
Fixes: 134472294
Bug: 135142209
Test: make RunSettingsRoboTests
Change-Id: Ia9362b7f26309bdbd6c5e8140fb606b28e2b34d8
2019-06-13 23:24:34 +00:00
Lei Yu
41bb2cb6a8
Handle null intent in WifiCallingPreferenceController
...
When intent is null, we will hide wifi calling preference however
its listener might still triggered with null intent.
This CL update controller so it can handle this event inside listener
callback.
Fixes: 135095929
Test: RunSettingsRoboTests
Change-Id: I4c5aba03871f11a2d9f9b4da329c2c2655ff9adb
2019-06-13 14:47:56 -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
70af71155d
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 56897c6bfc
2019-06-13 11:34:57 -07:00
Julia Reynolds
c4b408439e
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 56897c6bfc
2019-06-13 11:34:48 -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
android-build-team Robot
e7cd32110d
Snap for 5657398 from 2bff53a21e to qt-c2f2-release
...
Change-Id: Ia38dbba56220be21fa2f45e4a9c230632d49aa06
2019-06-13 17:27:23 +00: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
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
57371fdd1d
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: a05cb731e7
2019-06-13 08:52:40 -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
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
270da81a36
Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
...
am: 2bff53a21e
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
2019-06-12 21:52:03 -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
Kevin Yao
e6ae9219ce
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
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
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
