Lei Yu
121af54d64
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
Change-Id: I27e4ddd96d4f4ef4d0545c94aea12c0c442ad10f
2019-06-14 16:13:03 -07:00
Lei Yu
ab2a2b3d3f
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
Change-Id: I025073624de894f70216eb46bb9cd48e8435f9dd
2019-06-14 15:59:10 -07:00
Lei Yu
b4d94a8ccc
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
2019-06-14 22:38:59 +00:00
Yi Jiang
1e372557f4
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
...
am: 575bdfcaad
Change-Id: I98f9ff0cfe6cc6880b3b53b79c399dc3e1cf8309
2019-06-14 15:36:10 -07:00
Yi Jiang
575bdfcaad
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
2019-06-14 22:14:13 +00:00
Kevin Chyn
2d586f18f8
Update string for work profile face unlock
...
Fixes: 134053456
Test: With work profile and fully managed device, strings are correct
Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158
2019-06-14 12:56:59 -07:00
Yi Jiang
336b0c23c5
Move the permission warning message to corresponding layout file.
...
Bug: 129284701
Test: Manually verified
Test: atest AdaptiveSleepPermissionPreferenceController
Change-Id: Ic31bdb37f751288ae6dcd1253d56806c767e2e47
2019-06-14 12:11:49 -07:00
Ivan Podogov
75a10d1fd2
Add "Your work policy info" entry in Privacy settings
...
Bug: 132904820
Test: manual
Change-Id: Id706d450c3ad6a6a8c1e402d39d18e048cdb6519
2019-06-14 13:07:21 +01:00
Yiwei Zhang
6729773973
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
...
am: 8bde8b44f5
Change-Id: I30c5973667f4c74a218fc0eee821dbb9abab026a
2019-06-13 18:45:40 -07:00
Yiwei Zhang
8bde8b44f5
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
...
am: 4af74dd86d
Change-Id: Ifef443ad30d40b6f5e2f06025da85f9d572d358d
2019-06-13 18:16:44 -07:00
Antony Sargent
ad01ee4505
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: 24ebff2ff3
Change-Id: I2a025280155f5b78cea3f9328398a3fe8e4e12e2
2019-06-13 16:58:43 -07:00
Antony Sargent
24ebff2ff3
Merge "Fix Calls/SMS default SIM selector" into qt-dev
...
am: 7af299c604
Change-Id: I35b3e57d151b6d20e5b088a7d6269490317644e5
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
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
c4b408439e
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 56897c6bfc
Change-Id: I9b0c91a886be88698d8e559f38ec4770394dd7c2
2019-06-13 11:34:48 -07:00
Julia Reynolds
56897c6bfc
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
Change-Id: I60352b05ca01838882b31f0106108c5392bc3c50
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
57371fdd1d
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: a05cb731e7
Change-Id: If4fd4e881ee98bbe21c70cd24ba2816edc94e63e
2019-06-13 08:52:40 -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
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
2bff53a21e
Merge "Fix typo for Accessibility permission dialog" into qt-dev
...
am: e78e4dc6f2
Change-Id: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
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
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
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
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
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
joshmccloskey
4701f0d364
Merge "Increased toggling area" into qt-r1-dev
...
am: a854373bee
Change-Id: I0861cf24ce165312ab7419f09834feb060bd2532
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
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
2875010cd0
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: a621f8a374
Change-Id: I2744ff72f969d635eff1b4b00d710e86ed61569d
2019-06-11 14:42:45 -07:00
Fan Zhang
a621f8a374
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c
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
Antony Sargent
bf784da3ba
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: 5d186f5346
Change-Id: If5d9e121d1258f94446dd22c8ba6421bf4f83c70
2019-06-11 13:19:50 -07:00
Antony Sargent
5d186f5346
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
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
0c2b7c4281
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
Change-Id: I4f128a5f04212531a6e0b81660c0a80d86af4cc1
2019-06-11 12:28:15 -07:00
TreeHugger Robot
9fb76d02bb
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
2019-06-11 19:13:45 +00:00
tmfang
1096299433
Fix overlapping problem on notification screen am: 564fcb90ab
...
am: a5715f7d9c
Change-Id: I15dee21bbd03123c4b1c6f22eee989b328f69d31
2019-06-11 10:54:26 -07:00
tmfang
a5715f7d9c
Fix overlapping problem on notification screen
...
am: 564fcb90ab
Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
2019-06-11 10:46:32 -07:00
Arc Wang
751eba205b
[Wi-Fi DPP] Support WPA2/WPA3 transition mode
...
This change shows buttons of QR code scnanner and QR code generator
for a connected Wi-Fi network.
Bug: 134706055
Test: Generate QR code for a WPA2/WPA3 personal transition mode Wi-Fi AP
and check if the security type is WPA2 personal.
Generate QR code for open network.
Generate QR code for OWE network.
Scan a QR code of open network, verify connection.
Scan a QR code of OWE network, verify connection.
Scan a QR code of WPA3 network, verify connection.
Scan a QR code of WPA3 network, verify transition mode connection.
Change-Id: I60f2c38585f85745f992fa63a5ea85312f08c5e5
2019-06-11 15:10:43 +08:00