android-build-team Robot
a8272f5783
Snap for 5667566 from a5018be48a to qt-release
...
Change-Id: I4591a01d8f90d03bbb89eb2be01ee0c5a9199cf5
2019-06-18 03:13:50 +00:00
Andrew Sapperstein
5210e5f7a0
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
2019-06-17 20:02:21 -07:00
Andrew Sapperstein
e54ccf67ec
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
2019-06-17 20:00:33 -07:00
Andrew Sapperstein
5022730330
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: 935eac5c7f
2019-06-17 19:59:31 -07:00
Andrew Sapperstein
e6f8d61135
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
2019-06-17 19:45:27 -07:00
Andrew Sapperstein
935eac5c7f
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
2019-06-17 19:45:26 -07:00
Bookatz
de2743f7ae
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a am: 58f6926882
...
am: 778bac8717
2019-06-17 19:40:55 -07:00
Kevin Chyn
93ea1f8440
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev am: 5ac3690908
...
am: 0a519b9cbb
2019-06-17 19:31:24 -07:00
TreeHugger Robot
05ee8ba830
Merge "Add string for module license." into qt-dev
2019-06-18 02:27:09 +00:00
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
a16818f19f
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a am: 6a3f2bfe2a
...
am: 426d0a70fa
2019-06-17 19:04:35 -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
Arc Wang
c7d32d1cc1
[Wi-Fi DPP] Fix UI defects
...
1. Set scan icon minWidth 64dp instead of 48dp
2. Show finish button after Wi-Fi Easy Connect handshake successfully
Bug: 129666609
Bug: 135490433
Test: manual visual
Change-Id: Ifcdbe61b314a9cce3043965e9e5b67406c4616f9
2019-06-18 09:52:25 +08: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
904f0770e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours am: 2a96b7f13e -s ours
...
am: f0ae19caf4
2019-06-17 17:26:11 -07:00
Bill Yi
0bc63c8e34
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours am: 8ca571f9be -s ours
...
am: 605e269e57
2019-06-17 17:25:09 -07:00
tmfang
c0b3856dbe
Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp
...
am: 50bb07c812
2019-06-17 17:20:45 -07:00
tmfang
da9a5fefb4
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: aa36567d4a
...
am: dcfde9c65d
2019-06-17 16:55:53 -07: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
Ivan Podogov
f81813006e
Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp
...
am: ada83062de
2019-06-17 06:04:04 -07:00
Ivan Podogov
e142b7ee3f
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 8573d27d31
...
am: aa813f5618
2019-06-17 06:03:09 -07: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
