Automerger Merge Worker
5d722ee5b4
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
am: 4059a7debf
...
Change-Id: Ie117611ebcf9af3b8eee319ad1ed3297e2339c09
2020-03-17 12:21:40 +00:00
Automerger Merge Worker
7b83400539
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
am: f82c724f30
...
Change-Id: I19edd29222bc6176ac6f3b5ac3a75f170e78d54b
2020-03-17 12:21:40 +00:00
Automerger Merge Worker
d87561f113
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: c57774521c
...
Change-Id: Iaaa8782d661a4aab5fa0c3bf05e9180be57bcafa
2020-03-17 12:11:00 +00:00
Automerger Merge Worker
4059a7debf
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
...
Change-Id: I0e6ea23f432c71562274c69e1c203e15cef9ce45
2020-03-17 12:04:32 +00:00
Automerger Merge Worker
f82c724f30
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
...
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
2020-03-17 12:04:25 +00:00
Automerger Merge Worker
c57774521c
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
2020-03-17 11:50:00 +00:00
Automerger Merge Worker
05985cb26e
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev
2020-03-17 11:32:34 +00:00
Bill Yi
8f23d00553
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
2020-03-17 04:18:33 -07:00
calvinpan
ff11f200c8
Add NR Global to the logic to check if it is Global
...
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
2020-03-17 18:27:34 +08:00
Alex Johnston
79e66ffafe
Fix strings for certificate installation in Settings
...
Certificates privacy page
* Changed 'Your privacy is at risk' to
'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
'Install anyways'.
Can't install certificate dialog
* Changed 'Can't install certificates'
to 'Can't use this file'.
Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
2020-03-17 10:05:28 +00:00
Yanting Yang
298a7fe2e5
Remove the index of the homepage category tiles
...
Do not index the tiles of homepage category since we would like to index
their target activity for search.
Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
2020-03-17 17:55:49 +08:00
Automerger Merge Worker
d925b2f811
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: b8b7c24bcc
am: b152652975
am: 93bb2bb58d
...
Change-Id: Ia61f4213d50bd882ad46658da8ea0f8169742879
2020-03-17 06:50:00 +00:00
Automerger Merge Worker
93bb2bb58d
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: b8b7c24bcc
am: b152652975
...
Change-Id: Ifeacb4ccf071058a528d9bc49ca529a089b37b89
2020-03-17 06:44:31 +00:00
Automerger Merge Worker
0e0797f719
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: e599f0432e
am: 708fa8dc80
am: 404bd786ce
...
Change-Id: I3a5e31199618b9da238d150fe78c2323b7bcdb8e
2020-03-17 06:44:06 +00:00
Automerger Merge Worker
850ec0b38a
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: d4bf77db85
am: 5b0b67f6fd
...
Change-Id: Ib2cc96a21a81b58cf1606daef9a4da48998e5f95
2020-03-17 06:43:58 +00:00
SongFerngWang
3d54554521
Fix sim pin lock preference disappear in dual sim.
...
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.
Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
Automerger Merge Worker
404bd786ce
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: e599f0432e
am: 708fa8dc80
...
Change-Id: I88d89198977f4d413c082a99de4e99d30863fd4e
2020-03-17 06:32:59 +00:00
Automerger Merge Worker
b152652975
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: b8b7c24bcc
...
Change-Id: I1ea9e08fbf6eb1f55f46fb031e53eb0de36c77ec
2020-03-17 06:32:43 +00:00
Automerger Merge Worker
5b0b67f6fd
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: d4bf77db85
...
Change-Id: If065eed917c854dd0154b3474d181eb8087e51ba
2020-03-17 06:32:37 +00:00
Automerger Merge Worker
708fa8dc80
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: e599f0432e
...
Change-Id: I204f5e8e8738f3e1ed1202556d455ed7aa2cfa6f
2020-03-17 06:11:59 +00:00
Automerger Merge Worker
b8b7c24bcc
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
...
Change-Id: I34e02d8f1edbe3db7e9128feda8fafa27bcd6695
2020-03-17 06:11:44 +00:00
Automerger Merge Worker
d4bf77db85
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
...
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
2020-03-17 06:11:19 +00:00
Automerger Merge Worker
da9185b887
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: I6807e9d6a88c7a82b5835c773f1216bbe5cd3f24
2020-03-17 05:58:49 +00:00
Automerger Merge Worker
e599f0432e
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev
2020-03-17 05:43:45 +00:00
Automerger Merge Worker
83bdd8c759
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: 20de5d75b3
am: d01dc26567
am: 0bb230f6e9
...
Change-Id: I6f1726cfe3198a70e9991259e28e6723d3c9a630
2020-03-17 04:34:44 +00:00
Automerger Merge Worker
0bb230f6e9
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: 20de5d75b3
am: d01dc26567
...
Change-Id: Ib0a0ceb065ad8bdd95574899e68faf4cbf158aab
2020-03-17 04:29:36 +00:00
Automerger Merge Worker
1ed88122e4
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: bd59e9ad27
am: 50130a741b
am: 8828c12ea3
...
Change-Id: Ic6f12ae824afac89dccd1f192f5e779dea42367c
2020-03-17 04:29:25 +00:00
Automerger Merge Worker
ef04267344
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: dab418626e
am: 61e1d03d3b
...
Change-Id: I25c789e70f36b64c4756ef3e1f118bdce22f3934
2020-03-17 04:29:14 +00:00
Automerger Merge Worker
d01dc26567
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: 20de5d75b3
...
Change-Id: I0ba276fa20965ed08efba2b83bfbc40687aa5bc3
2020-03-17 04:17:55 +00:00
Automerger Merge Worker
8828c12ea3
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: bd59e9ad27
am: 50130a741b
...
Change-Id: I0f9c210a396406bb0b475a4c77aae9c9218ed0c2
2020-03-17 04:17:41 +00:00
Automerger Merge Worker
61e1d03d3b
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: dab418626e
...
Change-Id: I66cd127231cec22ae96f18b763bc96961b3d4c9b
2020-03-17 04:17:34 +00:00
Automerger Merge Worker
50130a741b
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: bd59e9ad27
...
Change-Id: Iaf734e197a78bc6d513c0cd414d7b174f6d68a7d
2020-03-17 03:55:48 +00:00
Automerger Merge Worker
20de5d75b3
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
...
Change-Id: I76fa0d2087a9f540d2f9fcfe3c4f2b3e2ec7f45f
2020-03-17 03:55:47 +00:00
Automerger Merge Worker
dab418626e
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
...
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
2020-03-17 03:55:31 +00:00
Automerger Merge Worker
4e0c2cb88e
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
am: baa53722d9
am: 55bce43360
am: b1f26eb733
...
Change-Id: I0c0eafc4901e35f2ee4a036f712538ea570112ea
2020-03-17 03:48:02 +00:00
Automerger Merge Worker
281036623a
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 371df82782
am: 05f048dde5
am: a27bf8a587
...
Change-Id: I9d1acb144558021a31df7bdbfee57d591ed6f147
2020-03-17 03:47:24 +00:00
Automerger Merge Worker
b1f26eb733
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
am: baa53722d9
am: 55bce43360
...
Change-Id: I6583df5a12710441464d8ff7b2d79933caf9b1a1
2020-03-17 03:46:32 +00:00
Automerger Merge Worker
a13e03bb19
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
am: e37d169988
am: d320b6af2d
...
Change-Id: I7c56feba2c6f2b82b3cd002d3301cd940b903d09
2020-03-17 03:46:24 +00:00
Automerger Merge Worker
e1c3cdf682
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: I7e826cef3b212bcc53cbdc863e6e241fe656429a
2020-03-17 03:45:49 +00:00
Automerger Merge Worker
bd59e9ad27
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414
Merge "Output switcher header is not updated with the latest media content" into rvc-dev
2020-03-17 03:26:50 +00:00
Automerger Merge Worker
a27bf8a587
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 371df82782
am: 05f048dde5
...
Change-Id: Ib3add69b53da348b61254d32cf17204c40edd571
2020-03-17 03:24:06 +00:00
Automerger Merge Worker
55bce43360
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
am: baa53722d9
...
Change-Id: I12a13b55465f2b4650095acb09194302877237e4
2020-03-17 03:23:52 +00:00
Automerger Merge Worker
d320b6af2d
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
am: e37d169988
...
Change-Id: Ib109951f8072e5abaae88ee8f840ab3c99298abf
2020-03-17 03:22:48 +00:00
Automerger Merge Worker
05f048dde5
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 371df82782
...
Change-Id: I68b21a5b1352674b31ec9b512684856c45142929
2020-03-17 03:06:23 +00:00
Automerger Merge Worker
e37d169988
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
...
Change-Id: I124abd0ffb65c56245669d26f3d9400bed89dc4a
2020-03-17 03:05:36 +00:00
Automerger Merge Worker
baa53722d9
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
...
Change-Id: Ie8bed1d1db32aed9402594b81675477b6c214be5
2020-03-17 03:05:16 +00:00
Automerger Merge Worker
371df82782
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
...
Change-Id: I226fb53261abdeb91e6b8bc77eadc698b1863140
2020-03-17 02:48:03 +00:00