Bookatz
778bac8717
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 58f6926882
2019-06-17 19:12:01 -07:00
Kevin Chyn
0a519b9cbb
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
...
am: 5ac3690908
2019-06-17 19:07:53 -07:00
Bookatz
426d0a70fa
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 6a3f2bfe2a
2019-06-17 18:54:09 -07:00
Bookatz
91c7deafaf
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 58f6926882
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
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
2019-06-17 18:43:05 -07:00
Bookatz
6a3f2bfe2a
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
...
am: a5018be48a
2019-06-17 18:43:04 -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
2019-06-17 16:54:17 -07:00
Bill Yi
f0ae19caf4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
...
am: 2a96b7f13e
2019-06-17 16:50:40 -07:00
Bill Yi
605e269e57
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
...
am: 8ca571f9be
2019-06-17 16:49:44 -07:00
Android Build Merger (Role)
50bb07c812
Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp
2019-06-17 23:48:22 +00:00
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
a6d47b246f
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: aa36567d4a
2019-06-17 16:44:15 -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
cf0610b838
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 8573d27d31
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
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
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
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
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
fe0a3054a4
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: d8818a5a21
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
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
121af54d64
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
2019-06-14 16:13:03 -07: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
