Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
c7501141ba
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370
...
Change-Id: I2bcc38d576f22a10a9e49c60f7963797496423e7
2020-03-12 06:18:24 +00:00
Automerger Merge Worker
141451127a
Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp
2020-03-12 06:17:59 +00:00
Automerger Merge Worker
fe7cf5f899
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7
...
Change-Id: I86d9bd3407b616621eebeb14f8980c9edc0fec1a
2020-03-12 06:17:55 +00:00
Automerger Merge Worker
5ed8894807
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70
...
Change-Id: Ia3e222438b0716557f23bf6d2e39a2de9abe7cd9
2020-03-12 06:17:51 +00:00
Automerger Merge Worker
d137a12391
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582
...
Change-Id: Ib117c57c211d00b8bff1efcef59e4f6eb789a794
2020-03-12 06:17:36 +00:00
Automerger Merge Worker
4c69bcab70
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
2020-03-12 06:03:46 +00:00
Automerger Merge Worker
548e9e0370
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
2020-03-12 06:03:43 +00:00
Automerger Merge Worker
9e15dc3582
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
2020-03-12 06:03:40 +00:00
Automerger Merge Worker
4636557ab7
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
2020-03-12 06:03:23 +00:00
Menghan Li
873b50a46a
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev
2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev
2020-03-12 05:37:19 +00:00
Tim Peng
e7bc985a35
Remove unnecessary permission for output switcher panel
...
-Make this as a generic panel
-Add CTS to make sure this panel works on all Android devices
Bug: 151272095
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4fe277144a586eaf902dc5b700027153b1c86ab
2020-03-12 05:13:26 +00:00
Automerger Merge Worker
65621e32a2
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521
...
Change-Id: Ie2914126f17d11c8115ae4d3c178a4c6259e71d5
2020-03-12 05:06:47 +00:00
Automerger Merge Worker
9701a87b2d
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c
...
Change-Id: I352a8e1ab7b7654f490d43d5291f60c68f9aa2e4
2020-03-12 05:05:50 +00:00
Automerger Merge Worker
3cce160521
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I345c9b8ccfcb801605066c2f0d14fe4b7a292d80
2020-03-12 04:49:10 +00:00
Automerger Merge Worker
70f287362c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I5f7a480c4dd5b035ad8e61e430d235dcd23c76e6
2020-03-12 04:48:55 +00:00
TreeHugger Robot
40613ef30c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev
2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55
Fix Card 2's pin shows ON when only turn on card 1's pin
...
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-12 03:56:46 +00:00
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
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
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
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
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
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
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
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
Kevin Chyn
8ee5045d68
Merge "Partial revert of ag/10482633" into rvc-dev
2020-03-11 20:56:42 +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
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
Automerger Merge Worker
bfa63c5fbd
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7
...
Change-Id: Id7db52b4409d8d12d5207f7298b58b7e20f745b5
2020-03-11 20:23:25 +00:00
Automerger Merge Worker
31933bea45
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
2020-03-11 20:17:25 +00:00
