Arc Wang
6934c0225b
Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice"
2020-07-23 01:38:08 +00:00
Arc Wang
551dcf08e4
Merge "[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity"
2020-07-23 01:37:47 +00:00
Anton Hansson
5801b85254
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours am: afc6e0ac41
-s ours am: e812d32eba
-s ours am: fc38f709f6
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I364a323ea8e2f5169931585adf9d66a7678f7e9c
2020-07-22 17:31:47 +00:00
Anton Hansson
fc38f709f6
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours am: afc6e0ac41
-s ours am: e812d32eba
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: Ieacd05ccc5a8e9644642f85056de5d55eb00d850
2020-07-22 17:05:28 +00:00
Anton Hansson
e812d32eba
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours am: afc6e0ac41
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I3aaca7efeeb861bdb711f86eda21643b800dedf3
2020-07-22 16:47:47 +00:00
Anton Hansson
afc6e0ac41
[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233
am: 7fe08c1923
-s ours
...
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I5a18c3037d6533ff85bf1f812cdc5214f99f2f50
2020-07-22 16:33:32 +00:00
Anton Hansson
7fe08c1923
Merge "Add explicit dep on ims-common" am: 0f6b2ec233
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159
Change-Id: I4a02bab9e52768605891f076f504256b3198fa4a
2020-07-22 16:11:05 +00:00
Anton Hansson
0f6b2ec233
Merge "Add explicit dep on ims-common"
2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246
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
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-22 14:40:27 +00:00
Goven Liu
ac26cd541c
Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1"
2020-07-22 11:06:29 +00:00
Goven Liu
6bbeb49a0b
Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 2"
2020-07-22 11:05:09 +00:00
Treehugger Robot
dbf64071d9
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
am: 7643891ae7
am: b33b295586
am: 81d394261d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: Id1b3714bb63e4bdb4289819dcd81c5d44df257d4
2020-07-22 09:46:45 +00:00
Treehugger Robot
81d394261d
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
am: 7643891ae7
am: b33b295586
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I2e5ec07200ea2e2a57f87be40284753fe4ccb2cc
2020-07-22 09:33:09 +00:00
Treehugger Robot
b33b295586
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
am: 7643891ae7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I474c32b3800cbf5a9c48a6086655b6c5ea8953eb
2020-07-22 09:22:13 +00:00
Treehugger Robot
7643891ae7
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
am: 44c538ccef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I2e9fc90f247f4b088f749afeb75a0b3e67e73198
2020-07-22 09:07:27 +00:00
Treehugger Robot
44c538ccef
Merge "Remove "storage type" preference from Settings" am: d6ac86d602
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609
Change-Id: I2c12af92fc35cbfc73a58773023bd2f36edeab15
2020-07-22 08:52:21 +00:00
Treehugger Robot
d6ac86d602
Merge "Remove "storage type" preference from Settings"
2020-07-22 08:34:56 +00:00
Arc Wang
0496d2c142
[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice
...
This change uses WifiTrackerLib's WifiPickerTracker & WifiEntry
to replace SettingLib's WifiTracker & AccessPoint.
This change includes
1. WifiScanWorker has the callbacks similar to a lifecycle component
but it's not a lifecycle component. Let WifiScanWorker implements
LifecycleOwner and provides #getLifecycle() for WifiPickerTracker.
2. Remove captive portal related code because WifiEntry#connect will
handle captive portal login if it's necessary.
3. Create WifiSliceItem to wrap WifiEntry because WifiEntry is an
abstract object and it does not provide copy constructor.
Without copy construcor, Wi-Fi Slice may show unexpected information
when a WifiEntry is updated.
Bug: 155613549
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.slice
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I2d66ea4905daca3244ec4cf8f2935cda817480b1
2020-07-22 07:53:18 +00:00
Treehugger Robot
2810a5aa63
[automerger skipped] Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
am: b85a454835
am: a59338f4be
am: b0bcaf6fea
-s ours
...
am skip reason: Change-Id I33be3fab9eb470b48c0d0870d4c03cdaecbac334 with SHA-1 902d5ee79c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: Ia894b202b033e4a9710f7bf582e816f93fdda125
2020-07-22 07:51:59 +00:00
Arc Wang
e57ead9a75
[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity
...
After this change, WifiDialogactivity supports both WifiTrackerLib and
SettingsLib because this is an exported UI component, some other APPs
(e.g., SetupWizard) still use SettingsLib.
Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.WifiDialogActivityTest
manual
In Wi-Fi Settings, manually add a Wi-Fi network.
In SetupWizard, manually add a Wi-Fi network.
Change-Id: I87f477d905cc6ea34ef1afbfade3773920dad6eb
2020-07-22 15:50:42 +08:00
Treehugger Robot
b0bcaf6fea
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
am: b85a454835
am: a59338f4be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I9185a72b5c417959a4d624cb4b23a8031ad77b3c
2020-07-22 07:31:06 +00:00
Treehugger Robot
a59338f4be
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
am: b85a454835
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I372c94673199e4483ed3668c3e0648ba0f6bc859
2020-07-22 07:13:32 +00:00
Treehugger Robot
b85a454835
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
am: bf44d4eed2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I8a0952d30e00f35779fd127abe9677a002f83186
2020-07-22 06:58:04 +00:00
Treehugger Robot
bf44d4eed2
Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: I46f554c200cb9f1c20e03a98f7188f3799bb6b5d
2020-07-22 06:46:52 +00:00
Treehugger Robot
01eeece2f1
Merge "Improve the performance of displaying preference - multithread."
2020-07-22 06:33:42 +00:00
Zoey Chen
c33f162fc9
Improve the performance of displaying preference - multithread.
...
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
2020-07-22 13:17:43 +08:00
govenliu
fec71036f7
[Wi-Fi] WiFi Settings inclusive language fix plan phase 2
...
Replace WiFi related terms which contain Blacklist,Dummy,Sane or Sanity Check wordings.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.
Bug: 161425297
Test: make RunSettingsRoboTests -j
Change-Id: I1ff89bd2a6636ada1e0f5b9879aecbbd5dab4012
2020-07-22 12:41:01 +08:00
Automerger Merge Worker
c44dc85ecc
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 am: f666bc8e85
-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: Id76e56c2a06d43f4682d8a4cc4f855f2636c9f10
2020-07-22 04:06:31 +00:00
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