Automerger Merge Worker
b167885376
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours am: c90737a257
-s ours am: 4302d438b0
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I1ea434c21fd6f82270ce785470ee4d1a4f282539
2020-03-12 10:40:12 +00:00
Automerger Merge Worker
4302d438b0
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours am: c90737a257
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: Iad03e6bdbd1ee5f7721fa7144ec3c0c228956c47
2020-03-12 10:18:43 +00:00
Automerger Merge Worker
c90737a257
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I572fec74b56a8e2e4e7f3ca9ecdc536a09a376bc
2020-03-12 09:53:24 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Automerger Merge Worker
3e46f0e167
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
am: cae2447a56
am: 779aa123c7
...
Change-Id: Ia671f444da9ce999aa5a02022f38bbaf6ce033ab
2020-03-12 07:11:00 +00:00
Automerger Merge Worker
bad44347d5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
am: c1059b0f25
am: c25ebdfb56
...
Change-Id: I144180075010cdce57933d3d5917dfba2aa66119
2020-03-12 07:10:06 +00:00
Automerger Merge Worker
779aa123c7
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
am: cae2447a56
...
Change-Id: I56bbe357b424ade4ce76ba892575c3363bf06c97
2020-03-12 06:55:22 +00:00
Automerger Merge Worker
c25ebdfb56
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
am: c1059b0f25
...
Change-Id: Ia15ff888a6672e952120888f6348e9b3323540ae
2020-03-12 06:55:03 +00:00
Automerger Merge Worker
cae2447a56
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
...
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +00:00
Automerger Merge Worker
b6abc73483
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
am: 4c69bcab70
am: 9c46665173
...
Change-Id: Iaf9a5af1afd3b0289a0754d310915f024aee01c9
2020-03-12 06:31:29 +00:00
Automerger Merge Worker
ec663b1e15
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
am: 9e15dc3582
am: 51b2592d11
...
Change-Id: If6d818c6770910614b63ce502f2a4d506c0f98f2
2020-03-12 06:30:55 +00:00
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
9c46665173
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
am: 4c69bcab70
...
Change-Id: I68a43988057229deae3a5b4c9daff400b6b5393e
2020-03-12 06:18:16 +00:00
Automerger Merge Worker
51b2592d11
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
am: 9e15dc3582
...
Change-Id: I7f4cab8841a2be25a59de419fc9a7bf5039312fc
2020-03-12 06:17:55 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9b9f4ec1b7
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
am: 7152f018fa
...
Change-Id: I91060da017fe98d629e06d9f817a88d71b33b2a6
2020-03-11 20:23:32 +00:00
Automerger Merge Worker
7152f018fa
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
...
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
2020-03-11 20:10:36 +00:00
Julia Reynolds
44b5b7c575
Update empty state for apps bypassing dnd
...
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
2020-03-11 18:09:47 +00:00
Jason Hsu
91e5ece7ab
Merge "Align help resource usage in caption preferences." into rvc-dev
2020-03-11 17:47:16 +00:00
Automerger Merge Worker
fad5089a5f
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
am: 539815566f
am: bafe942da7
...
Change-Id: If5c2ad317c6671dd897800c45869b9e6812b4353
2020-03-11 14:03:46 +00:00
jasonwshsu
27d06ff502
Remove search result for hidden magnification.
...
* Use searchable = "false" to suppress search indexes.
Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
2020-03-11 21:58:25 +08:00
Automerger Merge Worker
bafe942da7
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
am: 539815566f
...
Change-Id: I0ca06dd373492de0ca127fbe940fd1e29ae0e770
2020-03-11 13:48:13 +00:00