TreeHugger Robot
5a603c9fef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours am: d88cc7e01f
-s ours am: e642d28e25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: I43abccdc934497328b5c3bd47b5759cd69a60d70
2020-07-22 04:06:12 +00:00
Automerger Merge Worker
f666bc8e85
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours am: f3bde78e6d
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-22 03:41:15 +00:00
TreeHugger Robot
f7a62b4d23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours am: f3bde78e6d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: I50dd255deb4a277aa95554537c69575b8e78d98c
2020-07-22 03:41:06 +00:00
TreeHugger Robot
e642d28e25
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours am: d88cc7e01f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: I75ef2cf8d3a4d8588e5197acd623b2da144be712
2020-07-22 03:41:05 +00:00
TreeHugger Robot
d88cc7e01f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: I5d678bf5dbb4fadea92236276f29c30b991ebbfb
2020-07-22 03:20:38 +00:00
TreeHugger Robot
f3bde78e6d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204184
Change-Id: Ieb8d3dc3df7b83e2a04c9c58e3bdd40197e550f8
2020-07-22 03:20:35 +00:00
TreeHugger Robot
cc5fdda22e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-07-22 03:08:07 +00:00
Bill Yi
533b0f5299
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0c490cbe4d3a3c21a2ebfec2046cf8492de5f2f
2020-07-21 16:18:49 -07:00
Automerger Merge Worker
8c27db4fb4
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: 41d9c588eb
-s ours" into rvc-qpr-dev-plus-aosp am: 1ac0cca558
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: Ib2af0ee40fdbadd7aa37ba6c496987a67aacd4ad
2020-07-21 20:21:03 +00:00
Bill Yi
3d972f7f90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: cd282d2f47
-s ours am: e5727731fb
-s ours am: e3ced7bba8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I9503ba76583cea67969e5facf68568a47f670f3c
2020-07-21 20:20:51 +00:00
Automerger Merge Worker
e5a1c803f7
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: d98f641fca
-s ours" into rvc-qpr-dev-plus-aosp am: bac91c4ea3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I78b6635d570cc36cd9c957e62978ca6f99bd028e
2020-07-21 20:20:38 +00:00
Bill Yi
80934c657e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: d6b18921f0
-s ours am: 33b2e52e7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: Ic1756106361b70c58c5649245bdadeb53e9080c2
2020-07-21 20:20:24 +00:00
Bill Yi
95c1c59ce2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: 5d58d1a565
-s ours am: 3bffde37c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I23a74656d8fa79763ed85ed5d0540df0f67b9339
2020-07-21 20:20:11 +00:00
Automerger Merge Worker
1ac0cca558
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: 41d9c588eb
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-21 19:59:27 +00:00
Bill Yi
e313403c99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: 41d9c588eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: If25be3840f955c48cd00e045704ecbfdcd14973d
2020-07-21 19:59:23 +00:00
Bill Yi
e3ced7bba8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: cd282d2f47
-s ours am: e5727731fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I5f524c68c3ef50ce8ffb3e4609d6185e4263fefd
2020-07-21 19:59:18 +00:00
Automerger Merge Worker
bac91c4ea3
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: d98f641fca
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-21 19:59:14 +00:00
Bill Yi
262743bde0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: d98f641fca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I9c62b63cc1b1eea6547695060c3b0e49aace0ef7
2020-07-21 19:59:09 +00:00
Bill Yi
33b2e52e7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours am: d6b18921f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I8176e5231e8c15b1267d0393a9ca030a3056ff39
2020-07-21 19:59:06 +00:00
Bill Yi
3bffde37c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours am: 5d58d1a565
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I266661759a8e4d5770277e4afc1c4bf9138c32fb
2020-07-21 19:58:47 +00:00
Bill Yi
e5727731fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: cd282d2f47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I42bfa594d58b7bdfbae1010b708a6b7d67620529
2020-07-21 19:48:09 +00:00
Bill Yi
41d9c588eb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I78f5d02091240477fe94aea04fbe80213f97d227
2020-07-21 19:41:37 +00:00
Bill Yi
d98f641fca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I51328dd01d32d999500fd72c622168ed0e989860
2020-07-21 19:41:17 +00:00
Bill Yi
d6b18921f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours am: 8a34f66650
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I8d386ac068c8ddd43858efcb4b3bf1e657e8e8dd
2020-07-21 19:41:15 +00:00
Bill Yi
5d58d1a565
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448
Change-Id: I87f8241a7fbf2c16421124a88e7f40bac0d607fd
2020-07-21 19:41:02 +00:00
Bill Yi
8a34f66650
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I668468d502b5fd358665f59094cf3f7d78409da1
2020-07-21 19:29:14 +00:00
Bill Yi
cd282d2f47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I6e3e30c796380b104bffd9e627231fa76eb6f8d8
2020-07-21 19:29:08 +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
Bill Yi
88cbc21e3d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a428e1d08ba9fb70b26998d6df3d2c9cd2ded32
2020-07-21 10:28:44 -07:00
joffenberg
43ee102921
Remove "storage type" preference from Settings
...
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.
Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
2020-07-21 17:18:47 +02: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
govenliu
b70ddb9df7
[Wi-Fi] WiFi Settings inclusive language fix plan phase 1
...
Replace WiFi related terms which contain Master wording.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.
Bug: 161425297
Test: make RunSettingsRoboTests -j or
make RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=TopLevelNetworkEntryPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=PrimarySwitchPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I9395c50e092e124016609f88f7c8151554a0d874
2020-07-21 20:56:22 +08: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
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