Commit Graph

34039 Commits

Author SHA1 Message Date
Treehugger Robot
7df1fb2af1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 07:47:02 +00:00
Arc Wang
8d5c8c2611 [Wi-Fi] Check if domain field is not empty when users choose a ca certificate
Domain is required for client to validate server's certificate.
This change disable Save button for a new Wi-Fi network of a
specified CA certificate but empty domain.

Bug: 161378819
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      manual
      1. Install a certificate.
      2. Add a new Wi-Fi network of EAP method PEAP
      3. Set CA certificate to the certificate installed at 1.
      4. Save button should be disabled.
      5. Input something in domain field.
      6. Save button should be enabled.
Change-Id: I65c8b29ec7a03b21403ddbfc087ce48c2a4a69e4
2020-07-29 15:13:28 +08:00
Edgar Wang
7af9ea9c90 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I0254b07ba7ba096e33a9da3f828f99434ff07a2d
2020-07-29 14:12:04 +08:00
TreeHugger Robot
d1a60e73c8 Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" 2020-07-29 05:50:28 +00:00
Edgar Wang
4e02ceb8b4 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I890335a0c0e31f7d3ea32c6130482e4ef0e20b88
2020-07-29 13:36:09 +08:00
Treehugger Robot
a32b11f45b Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d am: 4727c3b1c5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I77609347466b45e081c14fd64274f9844dd9822c
2020-07-29 03:43:24 +00:00
Treehugger Robot
4727c3b1c5 Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: Idd6d6589c99d8b40eaba09cc435aac6fd5a5db0e
2020-07-29 03:27:08 +00:00
Treehugger Robot
c397bd301d Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I3b337e53b5696121ccb6a72634aebddf9c04f955
2020-07-29 03:08:26 +00:00
Treehugger Robot
d7e5e940ea Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
2020-07-29 02:48:26 +00:00
Blake Kragten
eda0a42118 Remove Enhanced Connectivity Dev Option
Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f
2020-07-28 22:44:06 +00:00
Curtis Belmonte
bd8f120e95 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
2020-07-28 20:12:49 +00:00
Curtis Belmonte
1aa03da058 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
2020-07-28 20:08:17 +00:00
Treehugger Robot
785b480259 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 am: 5486a2fdd4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Ia6bb375c12cf0acba4c5c79e292eefa2d69cddfe
2020-07-28 19:50:46 +00:00
Treehugger Robot
5486a2fdd4 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Iad124b74fc6c55d2220d340fbe14ae85ddcb1d13
2020-07-28 19:33:12 +00:00
Treehugger Robot
ed7662f6f6 Merge "BluetoothPairingRequest: Add null check for action" 2020-07-28 18:51:00 +00:00
Fan Zhang
0a23c4bf89 Add panic gesture settings page.
Ui is not final, the strings and video are placeholder only.

Bug: 161394591
Test: robotests
Change-Id: I8ada396506363e4711a1544e2c7ba1cd0e5d2dda
2020-07-28 09:54:12 -07:00
Treehugger Robot
083045a9c2 Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c am: ce59418d0a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I773bf1dd2fb3c8ef40681a598505cff004914966
2020-07-28 11:37:05 +00:00
Treehugger Robot
ce59418d0a Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
2020-07-28 11:25:00 +00:00
Treehugger Robot
17c895b94c Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I9d4404f5d94a9b18682b260eb7ed6413fb540202
2020-07-28 11:14:07 +00:00
Treehugger Robot
b2a470166e Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
2020-07-28 10:58:05 +00:00
Arc Wang
c5c92eb342 [Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects
This change removes

WifiDetailPreferenceController
WifiPrivacyPreferenceController

Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      Manualy add a Wi-Fi network of randomized MAC and a Wi-Fi network of device MAC
      in SetupWizard, then observe the MAC value in Settings Wi-Fi detail.
Change-Id: I82ef4e1d2c386d8bd751df8ff18c18163a0e9a6a
2020-07-28 17:36:41 +08:00
Arc Wang
e410325b37 [Wi-Fi] Support multi-SIM for SIM dependent EAP methods
Before this change, users are not able to choose SIM
card for SIM dependent EAP methods when a device supports
multi-SIM.

This change support to choose a SIM when adding an EAP
Wi-Fi network. And this change support to show the related
SIM information on Wi-Fi detail screen.

Bug: 142792009
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.WifiConfigController2Test
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
      Manually add an EAP Wi-Fi network of EAP-SIM type, observe the
      value in Wi-Fi detail screen.
Change-Id: I2910931166dc6541897663857c46abcc1b3115fa
2020-07-28 09:50:58 +08:00
Alan Stokes
cd2c453cbd More inclusive language.
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Kevin Chyn
0ab0255f4a Merge "1/n: Make ChooseLockSettingsHelper into a builder" 2020-07-27 05:33:44 +00:00
Arc Wang
f420f94e7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284

Change-Id: I14788fb9f4ce105fc4f095ccd2fdd4862022bcc9
2020-07-25 01:03:34 +00:00
Arc Wang
bd86a39c7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev 2020-07-25 00:52:56 +00:00
Arc Wang
55bce77aea Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"
This reverts commit ebf8ffd8fd.

Reason for revert: b/161659380

Bug: 161659380
Test: manual, observe threads after launching 'Network & internet'.
Change-Id: I28773eac40c6bf194e3410b829a1a7b744f79597
Merged-In: Id4901d632f7f4634461ebbbc096e36d348a33365
2020-07-25 00:51:50 +00:00
Chen Chen
a9ffaaec62 BluetoothPairingRequest: Add null check for action am: 1805f666e7 am: e8dd64f891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808

Change-Id: Ic34c9a8730c108d1d67eaeaeccdac2ab9c5ca9dd
2020-07-24 22:25:07 +00:00
Chen Chen
e8dd64f891 BluetoothPairingRequest: Add null check for action am: 1805f666e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808

Change-Id: I48e1d4f390a6c71c86d1c191d4b9090d1f4d29bc
2020-07-24 22:07:57 +00:00
Chen Chen
fc7b6693ee BluetoothPairingRequest: Add null check for action
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7)
2020-07-24 14:54:35 -07:00
Chen Chen
1805f666e7 BluetoothPairingRequest: Add null check for action
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
2020-07-24 18:15:19 +00:00
Kevin Chyn
b13bc50542 1/n: Make ChooseLockSettingsHelper into a builder
The multitude of slightly different launchConfirmationActivity(*)
methods are a big unsustainable pyramid. It's too difficult to
read, too difficult to track which clients are interested in which
parameters, and too difficult to add new parameters, since we need to

1) Read through all of them and find one that's the closest
2) Try not to affect other callers, so potentially add yet another
3) Modify the internal paths, which all basically call each other
   until it reaches the biggest launchConfirmationActivity which
   has ALL of the parameters

This change should have no behavioral change.

Note: CredentialStorage doesn't need returnCredentials anymore as of
      ag/6073449

Test: make -j56 RunSettingsRoboTests
Test: Manually traced code paths for each invocation. A few hidden
      dependencies (such as explicitly setting challenge=0 with
      hasChallenge=true) were found. Left them the way they were in
      case they were intended
Test: Enroll face, fingerprint
Test: Enable developer options
Test: Change to PIN, Pattern, Password, then back to PIN (so each
      type requests confirmation)
Test: adb shell am start -a android.app.action.CONFIRM_DEVICE_CREDENTIAL,
      authenticate
Test: adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
      (shows confirm credential screen)
Fixes: 138453993

Change-Id: Ic82ef3c3ac2e14d624281921f2d816bcdacbd82b
2020-07-24 11:13:13 -07:00
Arc Wang
4f9960231b Merge "[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage" 2020-07-24 03:21:35 +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
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
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
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +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
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