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
TreeHugger Robot
72b5b4a4c1
Merge "Refactor MyDeviceInfoFragmentTest"
2019-06-14 15:35:28 +00:00
TreeHugger Robot
940373e976
Merge "Fix bulleted list 2nd align issue in reset dialog"
2019-06-14 12:49:24 +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
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
Yanting Yang
3a0e5742a9
Fix bulleted list 2nd align issue in reset dialog
...
Bullet <li> was impacted by the spaces and newlines from string.
Tweak multi-lines to one line to correct the 2nd lines alignment.
Fixes: 132335156
Test: visual
Change-Id: I5af32cf373c7702d5fc8891a06c2cdffc6a01e0a
2019-06-14 19:43:04 +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
Kevin Chang
f0fbff62bc
Merge "Remove redundant style in accessibility permission dialog"
2019-06-14 09:47:14 +00: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
785d836283
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d am: 8bde8b44f5
...
am: e119076d2c
2019-06-13 19:53:37 -07: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
2019-06-13 19:03:43 -07:00
Antony Sargent
42020420ad
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: edcd8e9ca5
...
am: 6229a8bc58
2019-06-13 19:02:50 -07:00
Antony Sargent
16f93e0d19
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: 24ebff2ff3
...
am: 40a63920f5
2019-06-13 18:59:38 -07:00
Yiwei Zhang
e119076d2c
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
...
am: 8bde8b44f5
2019-06-13 18:53:08 -07:00
Kevin Chang
2293d7b304
Remove redundant style in accessibility permission dialog
...
Remove the redundant style of allow and deny button in the dialog
since these styles don't have override bodies which indicates that
the style of these two buttons can be replaced by the parent style.
Test: Visual
Fixes: 135166860
Change-Id: I500963196e7afe52065b1b615b35d07f6a77037a
2019-06-14 09:30:29 +08:00
Yiwei Zhang
b269177089
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
...
am: 16eef18cb8
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
2019-06-13 18:16:44 -07:00
Antony Sargent
6229a8bc58
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: edcd8e9ca5
2019-06-13 18:16:43 -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
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
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
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
