Anton Hansson
2c62b42f0f
[automerger skipped] Add explicit dep on framework-wifi.impl am: 40a8846e54 am: 668e8678aa am: a8bae3391c -s ours am: aa04b7999a -s ours
...
am skip reason: Change-Id I800b434c8049121db115cff87d51e164e4529999 with SHA-1 41f23de712 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: Ibc28729793c712a218218b94eaaffaa9321a575b
2020-07-21 19:05:53 +00:00
Anton Hansson
aa04b7999a
[automerger skipped] Add explicit dep on framework-wifi.impl am: 40a8846e54 am: 668e8678aa am: a8bae3391c -s ours
...
am skip reason: Change-Id I800b434c8049121db115cff87d51e164e4529999 with SHA-1 41f23de712 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: If9de0ad7afa7886fac7102f98057d5b8074340bc
2020-07-21 18:45:03 +00:00
Anton Hansson
a8bae3391c
Add explicit dep on framework-wifi.impl am: 40a8846e54 am: 668e8678aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: I4e632b7d812dbe855e3bfbc89aacfeec58043eee
2020-07-21 18:29:13 +00:00
Anton Hansson
668e8678aa
Add explicit dep on framework-wifi.impl am: 40a8846e54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165
Change-Id: I4609cf27376e2fe82540cd855a95ecf2b117d27e
2020-07-21 18:11:38 +00:00
Anton Hansson
b3ae10de20
Add explicit dep on ims-common am: d3c9df3e7e am: cf29ee30f0 am: 784b908bbb am: c248939170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: I1eb07e2ecafdcbe24538dc79e52da3b94ffce396
2020-07-21 13:19:04 +00:00
Anton Hansson
c248939170
Add explicit dep on ims-common am: d3c9df3e7e am: cf29ee30f0 am: 784b908bbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: Ic70207f16ff070cda1f054862da53b1afc8c7a07
2020-07-21 13:07:14 +00:00
Anton Hansson
784b908bbb
Add explicit dep on ims-common am: d3c9df3e7e am: cf29ee30f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: Id6f89d1188248c7838925df62425b53a9c3d1594
2020-07-21 12:48:40 +00:00
Anton Hansson
cf29ee30f0
Add explicit dep on ims-common am: d3c9df3e7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164
Change-Id: I3e0b30e399e85cf29128062dbbe9abfb843d5f63
2020-07-21 12:34:11 +00:00
Zoey Chen
d0fd4a4b1c
Merge "Improve the performance of displaying preference - multithread." am: 670d37c44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167382
Change-Id: Icfec2560adf55ad55f6d5fb631a62f2ebc45f9e0
2020-07-21 10:50:46 +00:00
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
41c1e467e9
Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc am: 442a99bedf am: 10a88c97b7 am: d951d5c034
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: I8e7b1ab8dcbf3b3ea2e620c8b01e37b1be4a811c
2020-07-21 08:17:30 +00: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
ff338bc41b
Merge "[Settings] Provide carrier name when manual network select" am: 728895acf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180124
Change-Id: I2e0704865a195061f697fa67af39902acfcb0e50
2020-07-21 06:07:12 +00:00
Bonian Chen
c7e5810612
Merge "Revert "Initial setup for slot change receiver migration"" am: 602b87e505
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193288
Change-Id: I1cbb6bc3096eda68442f7b4543baac2474b47957
2020-07-21 06:07:03 +00:00
Bonian Chen
5aa54561b0
Merge "Initial setup for slot change receiver migration" am: 50dd796f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12137823
Change-Id: I4544c3f2aad2d9d9a623e5d5e9330b6968309c0c
2020-07-21 06:06:51 +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
Josh Hou
157d689f7e
Remove the deprecated carrier config am: efa2a71b7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193285
Change-Id: Ib166a568c95e684c0b907cfe4bdda53a6be82035
2020-07-21 05:23:29 +00: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
ba87bd1205
Merge "[Settings] subscription UI should be closed when SIM is removed" am: c1a0293028
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180125
Change-Id: Id9a8c1d96f67e0c1fd9abf51060914870fa77eb5
2020-07-20 17:05:33 +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
73a9096766
Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 am: 11ed9a5133 am: 09cd543262 am: 1621b3601e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: Idb87d4f9e1064b27a132e284b11c9c1960a298ce
2020-07-20 16:02:16 +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
TreeHugger Robot
343157ba16
Merge "UX updates for notif history" into rvc-qpr-dev am: 1fafa1b738 am: 1ec9222c36 am: 6bbeb49f1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178344
Change-Id: I0af4645913ea63bb89a82c32d92261dab54b66c4
2020-07-20 14:55:24 +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
fd6df5a1f4
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: 57b46dd967 -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: I00e8598464808d24b6362a3ea597180c488b8d2a
2020-07-18 23:39:16 +00:00
TreeHugger Robot
23c2c10295
[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: 4458ba750f -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: I11dd27d3d534531f54865deccbc3e1e60f4d2ea7
2020-07-18 23:39:10 +00:00
TreeHugger Robot
af559cfe1e
[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: ea6107989c -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: I1ae1f26e56fb06f3dcbcf47e37499ef30bf92759
2020-07-18 23:39:02 +00: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