Commit Graph

61881 Commits

Author SHA1 Message Date
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
85c9d1dd97 [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours am: 5a870aa5d5 -s ours
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55 is in history

Change-Id: I91e9aa2aee38c9a6a3a7cc69d2b68ea3ee2b3877
2020-03-12 06:54:47 +00:00
Automerger Merge Worker
189116b4da Merge "[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours" into rvc-d1-dev-plus-aosp 2020-03-12 06:54:30 +00:00
Automerger Merge Worker
236ef7c6bb [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7 is in history

Change-Id: Ieac11e3e2f9a269c221ef548a80f9c3a4f3218fc
2020-03-12 06:54:25 +00:00
Automerger Merge Worker
57dee00e9c Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316
Change-Id: I398b4c88516a2a8736cf48f788415a6651e23f0a
2020-03-12 06:54:23 +00:00
Automerger Merge Worker
977a698823 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25
Change-Id: I87825756a6920e39019c5dce12d34afb57c1f02f
2020-03-12 06:54:18 +00:00
Automerger Merge Worker
b604210850 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173 am: b6abc73483 am: da23843848
Change-Id: I65fd96c715ea47186ab7421b89ec8e4b5ed478d1
2020-03-12 06:43:48 +00:00
Automerger Merge Worker
55b7730942 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 am: ec663b1e15 am: 05ce582a97
Change-Id: I203f79e676e35af101563b7f8f1861737b862858
2020-03-12 06:43:42 +00:00
Automerger Merge Worker
6724de2051 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 am: c7501141ba am: 051bf1bd58
Change-Id: Idf895bb6b0a00370b7791204b8f6b58979b01def
2020-03-12 06:43:35 +00:00
Automerger Merge Worker
56448214ed Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp am: 141451127a am: 441b50a0f2
Change-Id: I241d375669d539f87fcc062817f813006d73c885
2020-03-12 06:43:21 +00:00
Automerger Merge Worker
01233f2fc2 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 am: e5be54a8f4
Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
2020-03-12 06:43:06 +00:00
Automerger Merge Worker
da23843848 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173 am: b6abc73483
Change-Id: Ica7aab5739e6c1e72001fe787ceeb1c5eb7993cb
2020-03-12 06:43:02 +00:00
Automerger Merge Worker
05ce582a97 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 am: ec663b1e15
Change-Id: I12d1035dac37228b921c7b863f857a11ec4a4fe8
2020-03-12 06:42:51 +00:00
Automerger Merge Worker
5a870aa5d5 [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7 is in history

Change-Id: Iffc859da54d2e3b16d3f291a4e90349eff3b3d5e
2020-03-12 06:42:37 +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
Automerger Merge Worker
e673cc176f Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391 am: 81f18805dd
Change-Id: I7aa20264dced48447aa8ee8466b4f5e03b69bda3
2020-03-12 06:42:26 +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
a4fc50d316 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
Change-Id: If8c5007d7d1c2ca48420850acce74db358959f0f
2020-03-12 06:38:34 +00:00
Automerger Merge Worker
051bf1bd58 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 am: c7501141ba
Change-Id: I7cb9630b99be9891ad9994d708cb479e6b8e8eb1
2020-03-12 06:31:48 +00:00
Automerger Merge Worker
441b50a0f2 Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp am: 141451127a
Change-Id: Ie62d2806d00cbf9ac374f4b0f9e90a0048d0e30d
2020-03-12 06:31:43 +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
e5be54a8f4 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807
Change-Id: I9fa93764a09a4f216db6cb3507c20e6c12c14d25
2020-03-12 06:31:28 +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
Automerger Merge Worker
81f18805dd Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391
Change-Id: I1e08ca603df32db2d67eab07dd252792e77aaea9
2020-03-12 06:30:54 +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
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
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
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
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
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
Automerger Merge Worker
9aaeec79e6 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe am: ac24351d2a am: 48b6e13a2f
Change-Id: Ia9cfc3d3e1bf39f34ee247d44e52b6351fa5d18b
2020-03-12 05:54:24 +00:00
Automerger Merge Worker
48b6e13a2f Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe am: ac24351d2a
Change-Id: I0070b75ceade1d9607df4b051ffbca2bed756b73
2020-03-12 05:41:26 +00:00
Automerger Merge Worker
89a5580b49 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 am: 65621e32a2 am: 22e733f301
Change-Id: I81e2aba684a1fb06c4d71ae219ee4745297373f1
2020-03-12 05:41:12 +00:00
Automerger Merge Worker
e192eb634e Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: 9701a87b2d am: 37187c8141
Change-Id: I45dec95c06fe45e980bb4f62230058a20f059332
2020-03-12 05:40:59 +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
22e733f301 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 am: 65621e32a2
Change-Id: I5901de77bbc04c876ea6aff2226635923eb2c780
2020-03-12 05:20:35 +00:00
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
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
aa16276bbe Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c
Change-Id: Id0a18ac99f937486ebfecf026a9252bcd87aa0e0
2020-03-12 05:06:24 +00:00