Commit Graph

73108 Commits

Author SHA1 Message Date
Zoey Chen
670d37c44e Merge "Improve the performance of displaying preference - multithread." 2020-07-21 10:35:06 +00:00
Anton Hansson
40a8846e54 Add explicit dep on framework-wifi.impl
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: I800b434c8049121db115cff87d51e164e4529999
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
2020-07-21 10:18:51 +01:00
Anton Hansson
d3c9df3e7e Add explicit dep on ims-common
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-21 10:18:39 +01:00
Treehugger Robot
d951d5c034 Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc am: 442a99bedf am: 10a88c97b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I11b412ef999343e26fb32bff7ccc25aacced3034
2020-07-21 08:01:03 +00:00
Treehugger Robot
10a88c97b7 Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc am: 442a99bedf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I3c56b22f77436451a8e241714000929029fcdb3c
2020-07-21 07:46:05 +00:00
Treehugger Robot
442a99bedf Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I4d607a2c3141ce3c5863b41c88a3157ac6d622b9
2020-07-21 07:28:32 +00:00
Treehugger Robot
f876f3d0cc Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I21df066581d1f2a43b693026a7a389da81922f05
2020-07-21 07:12:31 +00:00
Zoey Chen
902d5ee79c Improve the performance of displaying preference - multithread.
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
2020-07-21 15:01:01 +08:00
Treehugger Robot
36c9ca1f2c Merge "Fix mvno data field summary not update issue" am: 4615179fc5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79
2020-07-21 06:58:14 +00:00
Treehugger Robot
4615179fc5 Merge "Fix mvno data field summary not update issue" 2020-07-21 06:44:08 +00:00
Bonian Chen
728895acf4 Merge "[Settings] Provide carrier name when manual network select" 2020-07-21 06:02:51 +00:00
Bonian Chen
602b87e505 Merge "Revert "Initial setup for slot change receiver migration"" 2020-07-21 06:01:24 +00:00
Bonian Chen
7caf6c541c Revert "Initial setup for slot change receiver migration"
This reverts commit 838aa43cc0.

Reason for revert: Pressed wrong button accidentally.

Change-Id: I24a9c5e37b471092ecee67a1b6d541cc4ad82360
2020-07-21 05:57:17 +00:00
Bonian Chen
50dd796f90 Merge "Initial setup for slot change receiver migration" 2020-07-21 05:56:16 +00:00
Bill Yi
708e1e4f9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
2020-07-20 21:45:04 -07:00
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