Commit Graph

60612 Commits

Author SHA1 Message Date
Automerger Merge Worker
37187c8141 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: 9701a87b2d
Change-Id: Id8b58eb824f69bce458224b92738a30d209cfc42
2020-03-12 05:20:29 +00:00
Automerger Merge Worker
ac24351d2a Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe
Change-Id: I270d7649d02a172c15a9fb27c05a3a96b1935fe0
2020-03-12 05:20:28 +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
aa16276bbe Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c
Change-Id: Id0a18ac99f937486ebfecf026a9252bcd87aa0e0
2020-03-12 05:06:24 +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
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
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
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
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