Ivan Podogov
8573d27d31
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
Change-Id: Ib61dae6c30e90500aaec381a6eb5f7f7a82bc610
2019-06-17 05:49:13 -07:00
Ivan Podogov
72bb3cc1f6
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
Change-Id: Idf96f32733b5a3aedab325cbeba4b67c1d20ce24
2019-06-17 05:49:13 -07:00
Ivan Podogov
9a1c75c57a
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
2019-06-17 12:39:10 +00:00
Sunny Shao
d7d4a7ce6d
Fixed the IllegalStateException on removing account
...
We display a dialog in AccountManager.removeAccountAsUser() callback, but at that
time fragment is onstop() which causes the IllegalStateException.
Fixes: 133253227
Fixes: 135004255
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
(cherry picked from commit d843ee85de
)
2019-06-17 10:30:21 +00:00
tmfang
720e92f62e
Get rid of "Assistant" from apps summary
...
Since "Notification Assistant" is no longer in Q,
we should remove the relevant name in summary.
Test: Rebuild
Fixes: 134180282
Change-Id: I0f41955769ec020d2dd7fbbc8424c95f1b5a32d9
2019-06-17 18:10:06 +08:00
android-build-team Robot
f8403bf4d0
Snap for 5663820 from 7d43125964
to qt-release
...
Change-Id: I0b4ac3d820a504991c8f771dd5fc9cb7cb20371b
2019-06-15 23:12:12 +00:00
android-build-team Robot
1d0c2f2643
Snap for 5663715 from 5d8cd009fa
to qt-c2f2-release
...
Change-Id: Ib34a1df2744ecd81c8bef649257ff0a7308b8313
2019-06-15 23:07:06 +00:00
Kevin Chyn
7581df0a53
Merge "Update string for work profile face unlock" into qt-r1-dev
...
am: 5d8cd009fa
Change-Id: If58e69c87fafb39dbf6fd6e6abfb1abb8bcead20
2019-06-14 18:21:18 -07:00
Kevin Chyn
031affb92b
Merge "Update string for work profile face unlock" into qt-r1-dev
...
am: 5d8cd009fa
Change-Id: I5f5cd08614bccf299ae153cf199bb9f466c4673b
2019-06-14 18:13:03 -07:00
Kevin Chyn
5d8cd009fa
Merge "Update string for work profile face unlock" into qt-r1-dev
2019-06-15 00:49:36 +00:00
Mehdi Alizadeh
123325c668
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: d8818a5a21
Change-Id: I2dbd27085109489e56ef916f31bf325c862dae92
2019-06-14 17:23:12 -07:00
Mehdi Alizadeh
d8220f8a46
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: 2fbd41a326
Change-Id: Iafbfb63497ff9b207bae3695ef1f660292e89804
2019-06-14 17:20:45 -07:00
Mehdi Alizadeh
fe0a3054a4
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: d8818a5a21
Change-Id: Id7e7a209d4c9a30bd1691204356c30bfa376e4a0
2019-06-14 17:18:59 -07:00
Mehdi Alizadeh
2fbd41a326
Show a dialog with a slider to set the back gesture's sensitivity
...
am: 7d43125964
Change-Id: I64cf3b8725efb8f8377e4f9dac545743066b2cbb
2019-06-14 17:11:54 -07:00
Mehdi Alizadeh
d8818a5a21
Show a dialog with a slider to set the back gesture's sensitivity
...
am: 7d43125964
Change-Id: I8db63be340f8cf465599ad76ea52f8b2453de3c0
2019-06-14 17:09:54 -07:00
Mehdi Alizadeh
7d43125964
Show a dialog with a slider to set the back gesture's sensitivity
...
Bug: 131447780
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Change-Id: I9fcd1a50c77689118857326de0cf8082e835b491
2019-06-14 23:40:11 +00:00
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
feee521179
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: 192367bef2
Change-Id: Ib92c2e2e2a2f72dcba2136433144cbe7bd342d45
2019-06-14 16:06:52 -07:00
Lei Yu
daed3366ef
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
Change-Id: Ic27910a58098eb4234e976cd2619a106bf4c347f
2019-06-14 16:06: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
192367bef2
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
Change-Id: I82623904692cd6f9cdf1daf50b366c8a41f15804
2019-06-14 15:56: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
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
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
e119076d2c
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
...
am: 8bde8b44f5
Change-Id: I74837fdb13a9f8b191f14a17b7579a30d6c6fc05
2019-06-13 18:53:08 -07: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
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
Antony Sargent
6229a8bc58
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: edcd8e9ca5
Change-Id: I0df2cfdb8214d8c6b9bc8fb653df36d1067b9165
2019-06-13 18:16:43 -07: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
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
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
Brad Ebinger
1984bd6d51
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a
am: 33b1bfb8fb
-s ours
...
am: f51dc265a0
-s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634
is in history
Change-Id: Id950f68115adcbccdc67c4db5dada37ace579246
2019-06-13 14:02:41 -07:00
Brad Ebinger
f51dc265a0
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a
...
am: 33b1bfb8fb
-s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634
is in history
Change-Id: I1486dd381d91fcbc415c03b616d716165325a689
2019-06-13 13:52:20 -07:00
Brad Ebinger
33b1bfb8fb
Merge "Allow SimDialogActivity to be started for result"
...
am: 11d92e894a
Change-Id: I016022dbc01916c32511244c1031f9a15359ecf5
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
Change-Id: Ic78fc2340681f9b53f3913a6d7d23b72027cc00f
2019-06-13 11:34:57 -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
01be0f85b3
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 39bff61eea
Change-Id: I77d343b8a0ccb1658c6a9c090d93cde7a06984af
2019-06-13 11:33:23 -07:00