Commit Graph

72839 Commits

Author SHA1 Message Date
Josh Hou
efa2a71b7e Remove the deprecated carrier config
Change the VoLTE slice behavior to align with VoLTE setting UI entry(Enhanced4gBasePreferenceController) and remove KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL carrirt conifg.

Bug: 159921798
Test: Fake some codes to verify VoLTE slice UI
Change-Id: I2a1852feb74fb411a44483bcdab2f52b03d1eaa7
2020-07-21 02:40:58 +00:00
Bonian Chen
c1a0293028 Merge "[Settings] subscription UI should be closed when SIM is removed" 2020-07-20 16:45:04 +00:00
Neil Fuller
1621b3601e Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 am: 11ed9a5133 am: 09cd543262
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ia5a57b297e19455106d7c479c97413f2bc1b6e0f
2020-07-20 15:50:52 +00:00
Neil Fuller
09cd543262 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 am: 11ed9a5133
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Id36b65955f7f41c8e825c9727dad5c65685f3117
2020-07-20 15:34:06 +00:00
Neil Fuller
11ed9a5133 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ieb4ebc79685777bc660df1c3c3aa19e0216dfec3
2020-07-20 15:21:18 +00:00
Neil Fuller
173a7e73b3 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
2020-07-20 15:07:02 +00:00
Neil Fuller
83d7191a22 Merge "Track core platform API change" am: 1d45573eb2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ib891567707808332c1fda6228fbb191b13f7df38
2020-07-20 14:45:41 +00:00
TreeHugger Robot
6bbeb49f1a Merge "UX updates for notif history" into rvc-qpr-dev am: 1fafa1b738 am: 1ec9222c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178344

Change-Id: I3cadce5ce0049436c371780d91603ab7a95feb39
2020-07-20 14:42:19 +00:00
Neil Fuller
1d45573eb2 Merge "Track core platform API change" 2020-07-20 14:39:35 +00:00
TreeHugger Robot
1ec9222c36 Merge "UX updates for notif history" into rvc-qpr-dev am: 1fafa1b738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178344

Change-Id: I3fa33a4f5334f05239a1ab4685485a8cb84295fa
2020-07-20 14:19:30 +00:00
TreeHugger Robot
1fafa1b738 Merge "UX updates for notif history" into rvc-qpr-dev 2020-07-20 14:08:10 +00:00
Neil Fuller
d1c4ea906f Track core platform API change
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.

Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
2020-07-20 11:26:14 +01:00
Automerger Merge Worker
57b46dd967 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: d019b9d4ff -s ours" into rvc-qpr-dev-plus-aosp am: 546d76d368 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I2516f3f8775559cec7f299be5aee03e62d2e8559
2020-07-18 23:22:40 +00:00
TreeHugger Robot
4458ba750f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: 733eed05c8 -s ours am: 2f0feea3c2 -s ours am: ec79c7e303 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: Id1285bd7d30cb164ae31834edc818d5b6e9efab3
2020-07-18 23:22:32 +00:00
TreeHugger Robot
ea6107989c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: 9af1becfce -s ours am: 23129fe972 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I95f4754c6dfbc4bf0502914987c449e3e99b2ac1
2020-07-18 23:22:22 +00:00
Automerger Merge Worker
546d76d368 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: d019b9d4ff -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 23:07:38 +00:00
TreeHugger Robot
64590f8cc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: d019b9d4ff -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: Ie5b3de37faa32e7fe1c227f8a9656aaafee41393
2020-07-18 23:07:33 +00:00
TreeHugger Robot
ec79c7e303 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: 733eed05c8 -s ours am: 2f0feea3c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I96a1de7563d1c05116adf3084c3a19e0e37af80e
2020-07-18 23:07:30 +00:00
TreeHugger Robot
23129fe972 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: 9af1becfce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I0ce7d9f9c484813625fb653239c25418e5030f83
2020-07-18 23:07:20 +00:00
TreeHugger Robot
2f0feea3c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: 733eed05c8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I581be581d49a7b490aac0b6cb091edf2eb271ac9
2020-07-18 22:45:56 +00:00
TreeHugger Robot
d019b9d4ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I5dc849c9fbe45e90b47adc9cb1632998f9322470
2020-07-18 22:45:52 +00:00
TreeHugger Robot
9af1becfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: Id714265422fcd526946b6dffc65fd18bf117866d
2020-07-18 22:45:37 +00:00
TreeHugger Robot
733eed05c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
2020-07-18 22:30:28 +00:00
TreeHugger Robot
c8cff2628f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729

Change-Id: I34932052aef59e637a60d74efeb1db6cfc807e77
2020-07-18 22:30:16 +00:00
TreeHugger Robot
a118c94070 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 22:14:24 +00:00
Bill Yi
504c673017 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
2020-07-18 01:41:07 -07:00
Automerger Merge Worker
d59e5f208e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours" into rvc-d1-dev-plus-aosp am: 432af91964 -s ours am: 43fa4ce074 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ie836426dc743c93072d410391f15515f182a9d9b
2020-07-18 01:59:39 +00:00
Automerger Merge Worker
c7059d6937 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours am: a679da84a0 -s ours" into rvc-qpr-dev-plus-aosp am: bed83a4519 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: I2c7a9b24a6cb1f1bb9d48e9f99c19860281c4444
2020-07-18 01:59:31 +00:00
TreeHugger Robot
7fa9af6c89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: 2101d1230a -s ours am: 881b14a74d -s ours am: 516f2072c7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Id96664371a0fce0420f960563e046d378b7c6d82
2020-07-18 01:58:19 +00:00
Automerger Merge Worker
43fa4ce074 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours" into rvc-d1-dev-plus-aosp am: 432af91964 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: I8813f1f465302e5e305a19771fa63c3490bebbe8
2020-07-18 01:38:09 +00:00
Automerger Merge Worker
bed83a4519 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours am: a679da84a0 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 01:37:32 +00:00
TreeHugger Robot
516f2072c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: 2101d1230a -s ours am: 881b14a74d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: I34625d3fc4edd3f090a8d4b36b62ef191d743378
2020-07-18 01:36:41 +00:00
TreeHugger Robot
4ce6f7a73e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours am: a679da84a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ia01214ca2bd472d7c66baaeff0f8d3288d4bb148
2020-07-18 01:36:39 +00:00
Automerger Merge Worker
f9f38639c8 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 5497c20d3b -s ours" into rvc-qpr-dev-plus-aosp am: a70aea4d5d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: Idd40564051f5b11bef7cc007286aece579580330
2020-07-18 01:21:02 +00:00
TreeHugger Robot
3375bb37ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 32b64b4a8b -s ours am: 3671a2caf3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: Iac602f23e3cbde2984832219688d2a228422ae41
2020-07-18 01:20:55 +00:00
TreeHugger Robot
a679da84a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: I87c0e2fcb1af85b6703706e1e31fda80a0bec4bd
2020-07-18 01:19:55 +00:00
Automerger Merge Worker
432af91964 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours" into rvc-d1-dev-plus-aosp 2020-07-18 01:19:55 +00:00
TreeHugger Robot
8817099bae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: I6a1b3dbf3c42eafdab788412813eb27d074abd5c
2020-07-18 01:19:47 +00:00
TreeHugger Robot
881b14a74d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: 2101d1230a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ia405f34b2e478d1c6e8f45b6c8d9642e094691ca
2020-07-18 01:19:46 +00:00
TreeHugger Robot
c6fc8a0274 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-07-18 01:18:03 +00:00
Automerger Merge Worker
a70aea4d5d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 5497c20d3b -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 01:01:37 +00:00
TreeHugger Robot
2101d1230a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ic225851e46b0907dcb136e74b46b09c01e3b0b8c
2020-07-18 01:01:32 +00:00
TreeHugger Robot
3dd3cd59dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 5497c20d3b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: If504f1e77276892a756453f7be4bd83a31ef1c9c
2020-07-18 01:01:32 +00:00
TreeHugger Robot
de0205d7f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ie466ac7c553b4b8a520b4be13c2b8df2400b0f82
2020-07-18 01:01:29 +00:00
TreeHugger Robot
3671a2caf3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 32b64b4a8b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I1d3d038b0b2a6c7dbc0646e9718a29caa8dfeef4
2020-07-18 01:01:27 +00:00
TreeHugger Robot
32b64b4a8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I8682ed0e9f836c5038299f34b936499e3e18404e
2020-07-18 00:49:23 +00:00
TreeHugger Robot
5497c20d3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I9cd904019282afea5c309a2518c1fcbd49f5c638
2020-07-18 00:49:16 +00:00
TreeHugger Robot
8469a447c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 00:49:01 +00:00
TreeHugger Robot
ef58f37dca Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-18 00:29:52 +00:00
Treehugger Robot
09e49ae39a [automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours am: b66acd05db -s ours am: a2bc9a8afe -s ours am: e9a9fb9b87 -s ours
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I157cb1e101bd46130b0d945f2bdf65992cb99898
2020-07-17 20:03:20 +00:00