Commit Graph

75262 Commits

Author SHA1 Message Date
Arc Wang
7167803573 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8 am: 1313ac5514 am: 0cc0a05399
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: I76bccc0593db1e53d81311249d314503232fb97e
2020-07-24 07:57:24 +00:00
Arc Wang
0cc0a05399 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8 am: 1313ac5514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: I30e68231e9c61e63a74d04f6429005d3771e9784
2020-07-24 07:42:48 +00:00
Arc Wang
1313ac5514 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: Ia25c646dc304f2b7ce71ae88fffa5331bff1a62f
2020-07-24 07:31:06 +00:00
Sunny Shao
befb192cb2 Fix the color-check-baseline checker error while repo upload
Fixes: 162044633
Test: pass color-check-baseline verification
Change-Id: Idca9db26db4b73d4b99d73e1b14b2953fc5dc754
2020-07-24 13:25:30 +08:00
Arc Wang
77b7d02058 Merge "[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage" am: 4f9960231b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11951645

Change-Id: Ic578c2912fe17109cc80d895a11fdd360b0406b2
2020-07-24 03:39:07 +00:00
Arc Wang
4f9960231b Merge "[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage" 2020-07-24 03:21:35 +00:00
Arc Wang
9c737122e8 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string
To improve UX.

Bug: 162035429
Test: manual visual
Change-Id: I00d6284a4a01f21e87559477ccfba5a64f882c5c
2020-07-24 03:13:24 +00:00
TreeHugger Robot
f9b675e1d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8d0ad7577 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8adeeebcd1d92d82857b41ee8a2ab790dd36bfd8
2020-07-23 21:01:21 +00:00
TreeHugger Robot
d8d0ad7577 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-07-23 20:44:34 +00:00
Bill Yi
8b078733b1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d1166009c549ea39f1af4c5845ca7efafacec58
2020-07-23 06:51:39 -07:00
TreeHugger Robot
7b1eb71d8e Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" am: bc7c42621b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11951640

Change-Id: I756bb335d03e744344741a928ac96f8a1bb04b31
2020-07-23 08:18:04 +00:00
TreeHugger Robot
bc7c42621b Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" 2020-07-23 08:01:19 +00:00
Arc Wang
16e0a896fe Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice" am: 6934c0225b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12188907

Change-Id: Ic008eb1a58fe179abb600f09ae9d876145504b8f
2020-07-23 01:57:28 +00:00
Arc Wang
d397d8ceaf Merge "[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity" am: 551dcf08e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178216

Change-Id: Ia397d4b5e5222096a29f62334d32cbf2ee4b8e46
2020-07-23 01:57:20 +00:00
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
de80e2990d [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: 5801b85254 -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: Iaf4ad73011a66f29f16fa17f2c612debd1b71223
2020-07-22 17:36:50 +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
4274053f04 Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1" am: ac26cd541c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180121

Change-Id: Iba5ce4f2c9103a924ff4f1d71cd20dac7fb79299
2020-07-22 11:29:39 +00:00
Goven Liu
c5e248341f Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 2" am: 6bbeb49a0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12201787

Change-Id: I06ddaf5f42216b428f92ff3502440984e5dbff59
2020-07-22 11:29:13 +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
40618bc59d Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 am: b33b295586 am: 81d394261d am: dbf64071d9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I560ce523352d61f6d2e7f11490ad72b764e7fd63
2020-07-22 10:04:19 +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
Treehugger Robot
7fe1297cf2 [automerger skipped] Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 am: b85a454835 am: a59338f4be am: b0bcaf6fea -s ours am: 2810a5aa63 -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: Ie0b7c412c340bdab7acccd8e09872481465dd6ce
2020-07-22 08:05:18 +00:00
Arc Wang
166ece8f1d [Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.dpp
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.details
Change-Id: I857cf0e261c1b07c3d7b6bc08632880ed8c71ee1
2020-07-22 07:53:52 +00:00
Arc Wang
fef7216ef9 [Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects
This change removes

AddDevicePreferenceController
WifiDetailPreferenceController
WifiMeteredPreferenceController
WifiNetworkDetailsFragment
WifiPrivacyPreferenceController

Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Id4901d632f7f4634461ebbbc096e36d348a33365
2020-07-22 07:53:33 +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
6afc16a404 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: c44dc85ecc -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: I7da6d30f906bcedbade6cc93fa957705ca27607d
2020-07-22 04:26:14 +00:00
TreeHugger Robot
46e9498a20 [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: 5a603c9fef -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: Ifbc772ba848248c0047053cfdb387c5e47e6ac02
2020-07-22 04:25:43 +00:00