Commit Graph

52499 Commits

Author SHA1 Message Date
TreeHugger Robot
a5018be48a Merge "If cannot add restricted profile, don't suggest it" into qt-dev 2019-06-18 00:47:16 +00:00
Bill Yi
e3fe597b36 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
am: 8ca571f9be -s ours
am skip reason: subject contains skip directive

Change-Id: I8288aaad5df249aabf288870ffa02df611a6976c
2019-06-17 16:54:17 -07:00
Bill Yi
8ca571f9be [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 99808b4824 -s ours
am skip reason: subject contains skip directive

Change-Id: Icfdb259298fe0246039daa2a518fc9a9492c92ab
2019-06-17 16:44:18 -07:00
tmfang
a6d47b246f Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
am: aa36567d4a

Change-Id: I4bbbeac964821e10110c9e55c3b1d766433456ca
2019-06-17 16:44:15 -07:00
tmfang
aa36567d4a Merge "Get rid of "Assistant" from apps summary" into qt-dev
am: a0ed4291dc

Change-Id: Ia0f9ef06ff90d8b355cceeb6302763119d8d29f0
2019-06-17 16:35:20 -07:00
TreeHugger Robot
99808b4824 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-17 23:35:01 +00:00
Andrew Sapperstein
25efb623eb Add string for module license.
Bug: 135183006
Test: is string addition
Change-Id: I6764331d4ef33242b0bef913f32a62799df173c3
2019-06-17 16:28:21 -07:00
TreeHugger Robot
a0ed4291dc Merge "Get rid of "Assistant" from apps summary" into qt-dev 2019-06-17 23:05:51 +00:00
Bill Yi
cbd3b1121b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 135215049
Change-Id: I48aaceea6d191bf7af302ad0365505fe96c2e186
2019-06-17 22:15:58 +00:00
Kevin Chyn
92d2aae337 Do not allow toggle to be clickable/focusable
The entire preference is already clickable/focusable. Also, changed it so that
the entire preferenceview is clickable/focusable in non-accessibility mode as well
to better match Settings UX.

Also, no need to setClickable, since it is already by default

Fixes: 130398575

Test: With and without accessibility turned on, toggle works
Test: With accessibility turned on, toggle no longer takes a separate
      focus in addition to the preference

Change-Id: Iaff05cdf350f8d4f4c0f53b539770a7ad1f7d8ad
2019-06-17 13:15:21 -07:00
Bookatz
673bc9d01c If cannot add restricted profile, don't suggest it
Previously, on devices that cannot add a restricted profile (e.g. most
phones), the Multiple users menu had an option to "Add user", whereas
for devices that can, the option read "Add user or profile". Now it only
says the latter, due to ag/6412347. We add back the original wording
here.

Fixes: 135294519
Test: manual confirmation on a phone that text says "Add user"
Test: m -j ROBOTEST_FILTER=UserSettingsTest RunSettingsRoboTests
Change-Id: Ia166b6ff9c69c0042e8a781be1146a5622177121
2019-06-17 18:33:16 +00:00
Ivan Podogov
cf0610b838 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
am: 8573d27d31

Change-Id: I9346a8f41cddf7a17e7ad1f7ed12d239740330c1
2019-06-17 05:56:09 -07:00
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
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
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
5d8cd009fa Merge "Update string for work profile face unlock" into qt-r1-dev 2019-06-15 00:49:36 +00: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
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
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