Yi Jiang
5bb10c46d2
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev am: 575bdfcaad
...
am: 7810fcc70c
Change-Id: Idd3f3e0eca13a82266e70af2a114f703e814ecdf
2019-06-14 16:03:20 -07:00
Yi Jiang
7810fcc70c
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
...
am: 575bdfcaad
Change-Id: I2955a9368fc769c6778f5773ef5d802287c34688
2019-06-14 15:36:12 -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
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
TreeHugger Robot
fe1a2476b3
Merge "Use Activity Context in RemoveAccountPreferenceControllerTest."
2019-06-14 19:01:39 +00:00
tmfang
ed728b8ae8
Refactor MyDeviceInfoFragmentTest
...
We shadow Fragment as workaround to prevent some errors
in onCreate for fixing b/135086559.
This CL tried to not mock everything for fragment.
We need to use correct way to create fragment lifecycle,
so it can avoid some errors likes b/135086559.
Test: atest MyDeviceInfoFragmentTest
Fixes: 135086559
Change-Id: I0d650bc700f570114861081d537f83a3ba14147b
2019-06-14 20:35:48 +08:00
Jonathan Scott
2b0d9a5778
Use Activity Context in RemoveAccountPreferenceControllerTest.
...
Test: make -j56 RunSettingsRoboTests
Bug: 117487838
Change-Id: I2647bf98018e72af24053a336c8246d1f7e5fd4b
2019-06-14 11:09:11 +01:00
TreeHugger Robot
5eb2c963c0
Merge "Use FooterPreference in xml explicitly"
2019-06-14 03:50:37 +00:00
TreeHugger Robot
78241bc06b
Merge "Update testcases which failed due to the SupportLibrary changed"
2019-06-14 03:11:33 +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
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
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
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
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
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
Antony Sargent
4d76ef7b2e
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346
...
am: f0e3ac6f27
Change-Id: I4dd3e2855de57f1a3e3001fa8cda3206e8e045f4
2019-06-11 13:27:54 -07:00
Antony Sargent
f0e3ac6f27
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: 5d186f5346
Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
2019-06-11 13:19:53 -07:00
Antony Sargent
af8fa25cfd
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e
2019-06-11 13:13:52 -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
878476e9ba
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am: 9fb76d02bb
...
am: ecbaa00855
Change-Id: I01a2ce816150cac7e14f046904b333c93bea49c9
2019-06-11 12:34:56 -07:00
Yi Jiang
ecbaa00855
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
Change-Id: I4131b9f13778ccb1c05ff60a94ebfc49a02319cf
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
dad177ada4
Fix overlapping problem on notification screen am: 564fcb90ab
am: 1c474bf789
...
am: 114864981a
Change-Id: I1dcbbdece7db796fe2a83fc9c81c88d794534319
2019-06-11 10:59:45 -07:00
tmfang
114864981a
Fix overlapping problem on notification screen am: 564fcb90ab
...
am: 1c474bf789
Change-Id: I39a2ee35350be2439cab8f3718ecc68fc99c4c82
2019-06-11 10:52:47 -07:00
tmfang
a5715f7d9c
Fix overlapping problem on notification screen
...
am: 564fcb90ab
Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
2019-06-11 10:46:32 -07:00
tmfang
1c474bf789
Fix overlapping problem on notification screen
...
am: 564fcb90ab
Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e
2019-06-11 10:45:44 -07:00
Fan Zhang
933786b399
Merge changes I05beec7d,Iad4e9fc2
...
* changes:
Remove "platform_slice" attribute from Settings.
Use slice uri from slice index db directly.
2019-06-11 17:12:12 +00:00
Yi-Ling Chuang
d6bd5b1339
Update sound summary when it is set to None.
...
Currently when the sound is set to None, we don't update the summary,
unless users go to other pages and come back. Now we refreash it for a
better user experience.
Fixes: 134994978
Test: robotest
Change-Id: I5d9c0238ee31e0c26ebde3201794c17737791c62
2019-06-11 17:21:58 +08:00