Bill Yi
3901db3f67
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342
-s ours
...
am: 6fd15de6f6
-s ours
am skip reason: subject contains skip directive
Change-Id: I7a78c1443618bdd532ce2b286279a36ebd558fe0
2019-06-18 08:03:29 -07:00
Bill Yi
6fd15de6f6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 23e86df342
-s ours
am skip reason: subject contains skip directive
Change-Id: I30e310a0e002907d0c0feff041d803dfe7705a54
2019-06-18 07:51:33 -07:00
Bill Yi
23e86df342
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iac730b3d5c81a72cd072a25c203e67035fae3cf6
2019-06-18 06:25:01 -07:00
Andrew Sapperstein
5210e5f7a0
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
Change-Id: Ided87f7c33a2feaf2491bb5890dfbc186261cb93
2019-06-17 20:02:21 -07:00
Andrew Sapperstein
e6f8d61135
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
Change-Id: I92e73c1774cc32bfc9cfbb3f6ce9470e9410871a
2019-06-17 19:45:27 -07:00
TreeHugger Robot
05ee8ba830
Merge "Add string for module license." into qt-dev
2019-06-18 02:27:09 +00:00
Bookatz
91c7deafaf
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 58f6926882
Change-Id: I298bb3163e8a796cffbe3e9d7ddc1d9bf47cfefc
2019-06-17 18:51:24 -07:00
Kevin Chyn
6d29acd0ef
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
...
am: 5ac3690908
Change-Id: Iedc0340b18af5b52f5f60b03b3333b4ee1b1dce1
2019-06-17 18:51:02 -07:00
Bookatz
58f6926882
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
...
am: a5018be48a
Change-Id: I76b1faf3e21f5b552ef3ad80660dee0786234d15
2019-06-17 18:43:05 -07:00
Kevin Chyn
5ac3690908
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
2019-06-18 01:40:35 +00:00
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
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