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
TreeHugger Robot
5eb2c963c0
Merge "Use FooterPreference in xml explicitly"
2019-06-14 03:50:37 +00:00
Yiwei Zhang
3cf030b3c6
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d am: 16eef18cb8
...
am: b269177089
Change-Id: I2c07fde777acef755eaa96ef9a780ee613fb8f1e
2019-06-13 19:03:43 -07:00
Antony Sargent
16f93e0d19
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: 24ebff2ff3
...
am: 40a63920f5
Change-Id: Icd3286369b6ff0abd9eccfc75cedc2b8acc8f544
2019-06-13 18:59:38 -07:00
Yiwei Zhang
b269177089
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
...
am: 16eef18cb8
Change-Id: Ie04066c4156f8a45c01f7be2784fde725d50cf56
2019-06-13 18:20:34 -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
TreeHugger Robot
8f9afaf99b
Merge "Set the mAccountName as null while device has no any account"
2019-06-14 00:40:59 +00:00
Antony Sargent
40a63920f5
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: 24ebff2ff3
Change-Id: I2968c6b031bc4c91753344a2b853e5e374e47d39
2019-06-13 17:31:52 -07:00
Yiwei Zhang
16eef18cb8
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
...
am: 4af74dd86d
Change-Id: I02f895a2c7b5a66dc71db0a60356d854c9123a82
2019-06-13 16:50:38 -07:00
Antony Sargent
edcd8e9ca5
Merge "Fix Calls/SMS default SIM selector" into qt-dev
...
am: 7af299c604
Change-Id: I588c6858b67101e03efff9235e96d799237135fe
2019-06-13 16:49:16 -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
2ab97e02cd
Refresh the whole rule in zen listing screen am: 78ef02eb8f am: 39bff61eea
...
am: 01be0f85b3
Change-Id: Ia366dd746291e127eb618ea9410a4d2f2aa83670
2019-06-13 11:42:55 -07:00
Julia Reynolds
01be0f85b3
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 39bff61eea
Change-Id: I77d343b8a0ccb1658c6a9c090d93cde7a06984af
2019-06-13 11:33:23 -07:00
Julia Reynolds
39bff61eea
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
Change-Id: I701a3678ab547584360c42e4f7b53755ba4059d6
2019-06-13 11:25:22 -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
ad7e3ee351
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: a05cb731e7
...
am: 9dd8ac1751
Change-Id: I115e563987fde5e3027f87f40e08be13de0dea3c
2019-06-13 09:10:25 -07:00
Yiwei Zhang
9dd8ac1751
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: a05cb731e7
Change-Id: Ie602e1f6913968c1e9213166cf9b69021699b5f7
2019-06-13 08:52:43 -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
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
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
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
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
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
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