Automerger Merge Worker
ad4601d0a9
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours" into rvc-d1-dev-plus-aosp
2020-04-08 01:07:29 +00:00
TreeHugger Robot
905df65efe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5b7d82d1a6e108b7b970e2b89b35c8ec590bfb59
2020-04-08 01:07:22 +00:00
TreeHugger Robot
7a21022523
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 7b22b09804
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If9aca46f310a8538abf4121dd99efb543030febc
2020-04-08 01:07:19 +00:00
TreeHugger Robot
0da8214ae4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I542c75f8e37a04987fa74bc83ec6fc4c8c691a62
2020-04-08 00:50:33 +00:00
TreeHugger Robot
7b22b09804
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I60a47c45f4494f7f5e3b396a7176bce00b2f5c31
2020-04-08 00:50:14 +00:00
Bill Yi
74281173a1
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours am: ca155cd26d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic8e71a27573248913f68efbff6bf7c334a587388
2020-04-08 00:38:47 +00:00
Bill Yi
d8796a70f3
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours am: 54f6c923d8
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I9d7f2e2dd675203842bc257d0f74ea0b62a871f3
2020-04-08 00:37:46 +00:00
TreeHugger Robot
f97c675cde
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5197f84d818588ccb3e3686b32c5e0beb12c1463
2020-04-08 00:36:53 +00:00
Bill Yi
ca155cd26d
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8d41aea0cd7c0dd5bd637cf7f14c82ef4748f7c3
2020-04-08 00:24:56 +00:00
Bill Yi
54f6c923d8
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I6bcb1265f56308386c9b54e25b5b34be5b74e375
2020-04-08 00:24:54 +00:00
TreeHugger Robot
5064d96e3a
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-04-08 00:18:18 +00:00
TreeHugger Robot
3318cf0afa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours am: b9bf1df5cb
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ied3f780783fe51050c9f3895087ad5d051f757b3
2020-04-08 00:11:49 +00:00
TreeHugger Robot
d1eca425d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours am: 5e4fb3f052
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie4ee1797164999b9df63db5bd00a601d3c45b40b
2020-04-08 00:11:36 +00:00
Menghan Li
7961890fb3
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 231b8ae707
...
Change-Id: I5052a8fa96cd9f455c3193b2d4435e52fb3afec9
2020-04-08 00:11:14 +00:00
Menghan Li
ed6d2ac408
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 48596c45a4
...
Change-Id: I98b38e3de8394e9b84d960b3a923aad6b7e47d2e
2020-04-08 00:11:00 +00:00
Bill Yi
2d031a2068
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc1bb3593dba2931cfe035fcca47b88a48767866
2020-04-08 00:10:43 +00:00
TreeHugger Robot
b9bf1df5cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaa869049896bbb5fc23e52be0739779b1cc9affe
2020-04-07 23:50:25 +00:00
TreeHugger Robot
5e4fb3f052
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I471e8af6bba792d60cb5f52604be74773e5f91fe
2020-04-07 23:50:24 +00:00
Menghan Li
231b8ae707
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
...
Change-Id: Id8ee5d83613b1e8c22f757781799aa4a18bcae98
2020-04-07 23:50:16 +00:00
Menghan Li
48596c45a4
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
...
Change-Id: I7fed711f096a26a1020869c8a882f1186678d6ae
2020-04-07 23:50:13 +00:00
TreeHugger Robot
18f56af885
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-07 23:47:28 +00:00
Menghan Li
a43f842c56
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev
2020-04-07 23:40:09 +00:00
Bill Yi
5e019b9540
[automerger skipped] Import translations. DO NOT MERGE am: ea107980f0
-s ours am: 4bd0afa73b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie59e6da70a0fecfb6c07bb878eb6e7857bcd206c
2020-04-07 22:55:40 +00:00
Bill Yi
7f9de04b0c
[automerger skipped] Import translations. DO NOT MERGE am: ea107980f0
-s ours am: 4e377ccb54
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8e7deb9fd5ad4c72467cc5c3e72620736b9c18ce
2020-04-07 22:55:30 +00:00
Bill Yi
31e944a20a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5302a1941d87bc6bc89039c91b5e4799f94259ec
2020-04-07 15:50:51 -07:00
Bill Yi
4e377ccb54
[automerger skipped] Import translations. DO NOT MERGE am: ea107980f0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib19b197500dddba205037e868dd08d66a0d3352f
2020-04-07 22:43:51 +00:00
Bill Yi
4bd0afa73b
[automerger skipped] Import translations. DO NOT MERGE am: ea107980f0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I820e94c8ae8d947aace33c995a3db9b444cbd77d
2020-04-07 22:43:45 +00:00
Bill Yi
ae901dc181
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I7094db11ac59ba3a27a9767e0b75b33ebe3a42f7
2020-04-07 15:17:43 -07:00
Bill Yi
a49e904780
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I37ab2380d2cd22581ddc8cfaa9d0f873ee5dc323
2020-04-07 14:47:22 -07:00
Bill Yi
ea107980f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Iac2e8d8906fd2900b3ef81c68135ba8b95b06590
2020-04-07 14:14:15 -07:00
Benedict Wong
1c69a8282c
Fix VPN settings UI to validate IPsec Identifier
...
This change ensures that the updateUiControls() (and validate()
transitively) is called whenever the IPsec identifier is updated.
Bug: 152811464
Test: Manual testing with settings UI
Change-Id: I6536652a60244c3fde3f65211f9d0709145c6cd9
2020-04-07 11:34:46 -07:00
Xin Li
9dc49223ab
DO NOT MERGE - Merge QQ2A.200405.005 into master
...
Bug: 150877681
Merged-In: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Change-Id: Ia97ace340fa53229dd3ebbe0caa09ab996755b5a
2020-04-07 11:29:38 -07:00
Automerger Merge Worker
d8d4c6ec57
Merge changes from topic "am-95ec15c13b8948e1b7e3eeb03b293219" into rvc-d1-dev-plus-aosp
...
* changes:
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
am: 9ca30c00b2
[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
am: 7c6cf5a537
2020-04-07 18:15:36 +00:00
Joshua Duong
3c02ed26cf
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
am: 9ca30c00b2
...
Change-Id: I4c76daaa21e33037ec39a9a1eb61db0d2836a8fe
2020-04-07 18:15:32 +00:00
Joshua Duong
13d1ab21a6
[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
am: 7c6cf5a537
...
Change-Id: I0896e0178ce5788282d76955e4cf34d0648d1df0
2020-04-07 18:15:29 +00:00
Joshua Duong
1db1005917
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
am: b56a1dde4c
...
Change-Id: I99bab05797892bc16b1e11eb0443289e5d166db0
2020-04-07 18:15:22 +00:00
Joshua Duong
7fe48efd12
[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
am: 586eb5ed83
...
Change-Id: Iab637847d5d43ab8e80dbe8b961625077698b209
2020-04-07 18:15:19 +00:00
Joshua Duong
9ca30c00b2
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
...
Change-Id: I1bb852b94007710de67876ee0a5e7300603d694a
2020-04-07 18:09:02 +00:00
Joshua Duong
7c6cf5a537
[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
...
Change-Id: If361d8c9e48f81a38f7745a8377fa3ea488fcf99
2020-04-07 18:09:00 +00:00
Joshua Duong
b56a1dde4c
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
...
Change-Id: I118932876cf382aefb10a353ee71d3ce1609b055
2020-04-07 18:08:51 +00:00
Joshua Duong
586eb5ed83
[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
...
Change-Id: Ice68896be60217349f486d337a1707c705505998
2020-04-07 18:08:49 +00:00
Joshua Duong
23040a3b2b
Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev
2020-04-07 18:07:16 +00:00
Joshua Duong
5866463e16
[a11y] Fix TalkBack readback on adb qrcode fragment.
...
TalkBack was picking up the text in the action bar, so if we hide it,
it will read the first body of text it encounters which would be "Scan
QR code. Pair device over Wi-Fi by scanning a QR code."
Bug: 152461605
Test: Manual. Enable TalkBack in Settings > Accessibility > TalkBack.
Navigate to Developer options > Wireless debugging > Pair by QR code.
When QR code scanner fragment opens, it should say "Scan QR code. Pair
device over Wi-Fi by scanning a QR code."
Change-Id: Ia91bf4ea215e6a377335f2b9dcf2acf10afd268e
(cherry picked from commit bfd73c0d78
)
Exempt-From-Owner-Approval: cherry-pick
2020-04-07 18:06:37 +00:00
Joshua Duong
2a85924977
[a11y] Set focus on "Pairing device" text once QR code is scanned.
...
Bug: 152462657
Test: Manual. Enable TalkBack in Settings > Accessibility. Navigate to
Developer options > Wireless debugging > Pairing device with QR code.
Scan a valid QR code, which should change to "Pairing device..." and
screen reader should say "Pairing device".
Change-Id: If467b56f787bda765fce1e5d46f8ab3c6210dc76
(cherry picked from commit 07ad841e2d
)
Exempt-From-Owner-Approval: cherry-pick
2020-04-07 18:06:25 +00:00
TreeHugger Robot
08273a87f6
Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
am: 1f80709343
...
Change-Id: I36f894fea05993af901ce916009388057e5e8c27
2020-04-07 14:42:24 +00:00
menghanli
be11a370e6
Fix gesture navigation popup is displaying inconsistently on the System navigation page.
...
- Need to use new api to get the accessibility service list.
Bug: 149665916
Test: local test
Change-Id: Ib712769436bf7be5fbea34ba2251bdbe6bcefb95
2020-04-07 22:42:20 +08:00
TreeHugger Robot
0e33c051c0
Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
am: ceac4f44b9
...
Change-Id: Ib835a71df1f54be8544e4d85f872dd9e43defcba
2020-04-07 14:40:27 +00:00
TreeHugger Robot
1f80709343
Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
...
Change-Id: Ic3ffd4305548bab9d15196cdccea795417566060
2020-04-07 14:24:39 +00:00
TreeHugger Robot
ceac4f44b9
Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
...
Change-Id: I650b9faf069cb50999d1a3d99665ff5d4411b956
2020-04-07 14:24:34 +00:00
TreeHugger Robot
7c4557bec8
Merge "Adjust tap targets in history" into rvc-dev
2020-04-07 14:12:35 +00:00