tmfang
dcfde9c65d
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: aa36567d4a
2019-06-17 16:47:32 -07:00
tmfang
3cc51bc280
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: d13fb40c4c
2019-06-17 16:47:32 -07:00
Bill Yi
2a96b7f13e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 99808b4824
2019-06-17 16:46:18 -07:00
Bill Yi
8ca571f9be
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 99808b4824
2019-06-17 16:44:18 -07:00
tmfang
aa36567d4a
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
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
tmfang
d13fb40c4c
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
2019-06-17 16:34:20 -07: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
Android Build Merger (Role)
ada83062de
Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp
2019-06-17 12:56:46 +00:00
Ivan Podogov
aa813f5618
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 8573d27d31
2019-06-17 05:56:12 -07:00
Ivan Podogov
c30147fbeb
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 72bb3cc1f6
2019-06-17 05:56:10 -07:00
Ivan Podogov
8573d27d31
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
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
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
031affb92b
Merge "Update string for work profile face unlock" into qt-r1-dev
...
am: 5d8cd009fa
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
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
2019-06-14 17:20:45 -07:00
Mehdi Alizadeh
2fbd41a326
Show a dialog with a slider to set the back gesture's sensitivity
...
am: 7d43125964
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
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
feee521179
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: 192367bef2
2019-06-14 16:06:52 -07:00
Lei Yu
daed3366ef
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
2019-06-14 16:06:03 -07:00
Lei Yu
ab2a2b3d3f
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
2019-06-14 15:59:10 -07:00
Lei Yu
192367bef2
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
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
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
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
2019-06-13 18:53:08 -07: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
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
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
