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
02d70a66f0
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: e5c6d8a658 am: 0167f39446 am: dff2648a5e
...
Change-Id: I58cd16ce4d67c1df7a6fbefb6ea8d5a4790eea32
2020-03-12 03:56:00 +00:00
Automerger Merge Worker
dff2648a5e
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: e5c6d8a658 am: 0167f39446
...
Change-Id: I871c3d68a76238d790ac2d95c7a68c111a0b29ca
2020-03-12 03:49:30 +00:00
Automerger Merge Worker
951e76cc04
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540 am: aa62a717b5 am: 81838c23be
...
Change-Id: I119b96901883250edb1ba303842f6c73dd48644b
2020-03-12 03:49:22 +00:00
Automerger Merge Worker
b73276489c
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: 9bd2280297 am: 1c9951fde6
...
Change-Id: Ie4c08847d5073c54b71827ed7f8cc19428628a3c
2020-03-12 03:49:06 +00:00
Automerger Merge Worker
81838c23be
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540 am: aa62a717b5
...
Change-Id: Icbb4bd4cbbba793e9ddec873ea416155d4809fad
2020-03-12 03:37:12 +00:00
Automerger Merge Worker
0167f39446
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: e5c6d8a658
...
Change-Id: Ic7242f092def9d02cf05d6960f11bd1a5406878d
2020-03-12 03:37:06 +00:00
Automerger Merge Worker
1c9951fde6
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: 9bd2280297
...
Change-Id: Ib9250a76a28ef2eb99d7d5ea1f27f272173d1c38
2020-03-12 03:37:06 +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
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
0ec302419e
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 8e6abb67ff am: 1eab1674c7 am: 349395663d
...
Change-Id: Ib84c2d3a9bc9e294121001752fed39a766f522a2
2020-03-12 01:31:15 +00:00
Automerger Merge Worker
4707ddb6f9
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7 am: 2564fce75b am: e27f6ef6fa
...
Change-Id: I62d92bf95bd0f4c0928dc118186815e791c02edf
2020-03-12 01:30:56 +00:00
Automerger Merge Worker
410a105c0c
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee am: 98f50c04d4 am: 0d62a0687a
...
Change-Id: I92f78105e5130213f6878bd5ffd6c5d71245fcc2
2020-03-12 01:30:30 +00:00
Automerger Merge Worker
73b3a58636
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08 am: fa134a16ee
...
Change-Id: Ib3238204bc319c40b8b852f487e831a04fc5ccd7
2020-03-12 01:29:09 +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
f9ef8f11ba
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c4ad2628e1 am: 338eaf911b am: b93cebd598
...
Change-Id: I7fda5317162fa7cdc8b4e339d3bd9188f7e97cb7
2020-03-11 22:06:02 +00:00
Automerger Merge Worker
0fd2779e86
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 69a31c2484 am: e7bd699b95 am: 5286c1d7dc
...
Change-Id: I7be450528d80943f03cf2330aa5e340c69d137d9
2020-03-11 22:04:43 +00:00
Automerger Merge Worker
0080388a16
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c678022a13 am: 75eaca4d0a
...
Change-Id: Ib1fbd3288797f15eb80036d42dcd6917b3c7bddc
2020-03-11 21:58:11 +00: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
ec6304c44c
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840 am: 6211d885d5 am: ce81c0baef
...
Change-Id: I1b739522472d64eb74562e45b78ec5eef980cadc
2020-03-11 21:28:45 +00:00
Automerger Merge Worker
b00b110070
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4 am: ee78d6a0d5 am: a20e11e02e
...
Change-Id: I535457923ccd4767d89438b05e64ea4daa14f868
2020-03-11 21:26:26 +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
