Automerger Merge Worker
aa62a717b5
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540
...
Change-Id: I18e7ba4726768df945913d906b47583dce9b1a3d
2020-03-12 03:16:21 +00:00
Automerger Merge Worker
e5c6d8a658
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f
...
Change-Id: I8dae29cedff1eb8b29d3244ae0b3343ae51fbed7
2020-03-12 03:16:20 +00:00
Automerger Merge Worker
9bd2280297
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f
...
Change-Id: Ibb0a7616784160bbf2be0242bf42cd1125411ab8
2020-03-12 03:15:53 +00:00
Automerger Merge Worker
ee7f5bc540
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: I343b3a129ef3875d45aabd52a9ffae85f14b8fcf
2020-03-12 03:04:12 +00:00
Automerger Merge Worker
93fedb0e3f
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: If84bded0c61524cda613f57ff0b7839817655eae
2020-03-12 03:04:00 +00:00
TreeHugger Robot
a7bd169814
Merge "Fix WifiTetherSettingsTest" into rvc-dev
2020-03-12 02:54:35 +00:00
Automerger Merge Worker
5f2520f685
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev
2020-03-12 01:35:21 +00:00
Automerger Merge Worker
349395663d
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 8e6abb67ff am: 1eab1674c7
...
Change-Id: I8f7e642ac02c04061a6279631c76795c67e269f7
2020-03-12 01:27:31 +00:00
Lucas Dupin
249d80ec7b
Blur developer setting
...
New dev-option for enabling and disabling blurs, on devices that support
it.
Bug: 149792636
Test: manual
Test: atest EnableBlursPreferenceControllerTest
Change-Id: I26b4739a7b811c461557316a9247f6a9c397048a
2020-03-11 18:17:46 -07:00
Automerger Merge Worker
e27f6ef6fa
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7 am: 2564fce75b
...
Change-Id: Ie1b45ae946d62be4bb27d9850dcf50149340f431
2020-03-12 01:17:41 +00:00
Automerger Merge Worker
0d62a0687a
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee am: 98f50c04d4
...
Change-Id: I8ba0f6eb7af1e8efde1eb3d7f29d81551cfc1485
2020-03-12 01:16:57 +00:00
Automerger Merge Worker
fa134a16ee
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08
...
Change-Id: I1b906898dc6ea91d62f80544c1e1a15c44557d29
2020-03-12 01:14:47 +00:00
Automerger Merge Worker
1eab1674c7
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 8e6abb67ff
...
Change-Id: Id7239efe8844ff59d90bdcb35135b4a76a9a4419
2020-03-12 01:14:34 +00:00
Automerger Merge Worker
2564fce75b
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7
...
Change-Id: I05246bc5a8550495c4467946d68e9b2ca9630b7a
2020-03-12 00:58:13 +00:00
Automerger Merge Worker
98f50c04d4
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee
...
Change-Id: Id4c6dcad47a067c76a2dcfe1eea1be07768ff068
2020-03-12 00:56:45 +00:00
Automerger Merge Worker
2776dbfa08
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3
...
Change-Id: Ifc411a318a26169cd3d65e120e8978217377c6a8
2020-03-12 00:56:14 +00:00
Automerger Merge Worker
8e6abb67ff
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3
...
Change-Id: I512522a3b88a90acf6655f3867987a676911e8d4
2020-03-12 00:55:54 +00:00
Automerger Merge Worker
61eb0791a3
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
...
Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
2020-03-12 00:40:12 +00:00
Automerger Merge Worker
631493c8e7
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours
...
am skip reason: skipped by user siyuanh
Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
2020-03-12 00:39:59 +00:00
Automerger Merge Worker
86fac6caee
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
...
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
2020-03-12 00:39:49 +00:00
TreeHugger Robot
cbd5ec24d7
Merge "Remove search result for hidden magnification." into rvc-dev
2020-03-12 00:25:03 +00:00
menghanli
a248e0e6d5
Update R acessibility assets and strings (1/n)
...
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen
Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
2020-03-12 07:18:58 +08:00
Automerger Merge Worker
b93cebd598
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c4ad2628e1 am: 338eaf911b
...
Change-Id: I2d2bfecce86bfefd5e2e911eb2c93dff19e91e15
2020-03-11 21:53:25 +00:00
Automerger Merge Worker
338eaf911b
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c4ad2628e1
...
Change-Id: Ifcbbd3259d9fd6dcda03c641f17750fbeb49f29d
2020-03-11 21:42:14 +00:00
Automerger Merge Worker
5286c1d7dc
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 69a31c2484 am: e7bd699b95
...
Change-Id: Ie4db901518ac69076b10bbe23c53afc36b72d553
2020-03-11 21:30:36 +00:00
Automerger Merge Worker
75eaca4d0a
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c678022a13
...
Change-Id: I5d56271aca26da73bc4f821d712455945f589e85
2020-03-11 21:29:32 +00:00
Automerger Merge Worker
e7bd699b95
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 69a31c2484
...
Change-Id: If2a4b69a9f335c24c3f82da22dcac4da0b674570
2020-03-11 21:24:01 +00:00
Automerger Merge Worker
c4ad2628e1
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
...
Change-Id: I448cbe85cafb3edf91d17b201d924ec2d79d888d
2020-03-11 21:23:21 +00:00
Automerger Merge Worker
c678022a13
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
...
Change-Id: Id210117c4d064bcd05adbc749a181271b5bd8413
2020-03-11 21:23:05 +00:00
Automerger Merge Worker
ce81c0baef
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840 am: 6211d885d5
...
Change-Id: I317a27a3122e4a404833159d97257e92b28e0415
2020-03-11 21:22:47 +00:00
Automerger Merge Worker
a20e11e02e
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4 am: ee78d6a0d5
...
Change-Id: I5da04bed3a5abc722d8deb58dc2d3626fc6eb0cb
2020-03-11 21:14:31 +00:00
Automerger Merge Worker
bbe24da6a1
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed
...
Change-Id: Ic1440ee5840cbf9e59193c39b9a717e5d88c327e
2020-03-11 21:10:24 +00:00
Automerger Merge Worker
6211d885d5
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840
...
Change-Id: I492181f4a01fdf01b1ff655354f9af3dc909a2e3
2020-03-11 21:06:50 +00:00
Automerger Merge Worker
69a31c2484
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
...
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
2020-03-11 21:00:17 +00:00
Automerger Merge Worker
0cb70101c7
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
...
Change-Id: I3dc14a3085153ff5bdfd9b94c80750f9c6595b64
2020-03-11 20:59:46 +00:00
Automerger Merge Worker
ee78d6a0d5
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4
...
Change-Id: I23cabacc7df3ef3e0a1238f24c10987a70f97fd1
2020-03-11 20:59:21 +00:00
Automerger Merge Worker
f0034eb4ed
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
...
Change-Id: I5b4d9c0ab3d2e087b0717728d6896209980986e1
2020-03-11 20:59:10 +00:00
Automerger Merge Worker
038905a840
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
...
Change-Id: Ibe007653565dc79c492a9fe6664b5ce40d9f8774
2020-03-11 20:58:56 +00:00
Kevin Chyn
8ee5045d68
Merge "Partial revert of ag/10482633" into rvc-dev
2020-03-11 20:56:42 +00:00
Automerger Merge Worker
8d34f80b42
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7 am: 9028365bca
...
Change-Id: Ic5925df8d18b92880dfc7eb67b775f492b7b6e28
2020-03-11 20:48:00 +00:00
Automerger Merge Worker
279d4d9983
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
2020-03-11 20:47:43 +00:00
Automerger Merge Worker
706c05eaf4
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
2020-03-11 20:47:37 +00:00
Automerger Merge Worker
0a33bcfdf4
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 89f85ccbf6
...
Change-Id: I822f2873c64505568478375bf5b9c68658028d1d
2020-03-11 20:35:42 +00:00
Automerger Merge Worker
9028365bca
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7
...
Change-Id: I7691bf710c0e7310fdf960868d30cd13eac11051
2020-03-11 20:35:04 +00:00
Automerger Merge Worker
87b44ea9da
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd
...
Change-Id: Ib20d10a128151a3e22e53f7f7a923e5942cadaef
2020-03-11 20:35:04 +00:00
TreeHugger Robot
79336396df
Merge "Update empty state for apps bypassing dnd" into rvc-dev
2020-03-11 20:33:15 +00:00
Automerger Merge Worker
18d9d24ee3
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-11 20:29:24 +00:00
Automerger Merge Worker
89f85ccbf6
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
...
Change-Id: Id9ac2f6a2b074e8a07a31c401051b135b9b8b34d
2020-03-11 20:24:00 +00:00
