Commit Graph

2402 Commits

Author SHA1 Message Date
Arc Wang
8692bb5924 [Wi-Fi] Apply WifiDialog2 in WifiSetings2
This change also implements context menu in WifiSettings2.

Bug: 70983952
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I13b5a3724207f76e2b24fd0c1c49a236ee0c44f0
2019-12-26 14:47:19 +08:00
Arc Wang
b33190c017 [Wi-Fi] Replace AccessPoint with WifiEntry for WifiDialog2
Bug: 146407136
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.detail2

Change-Id: I65899b24c186e1bd1bb0d00db52c67264f30f3cb
2019-12-26 14:45:38 +08:00
Arc Wang
f990dfa11e [Wi-Fi] Branch WifiDialog files for WifiTracker2 development
Add these files:

  WifiConfigController2.java
  WifiConfigUiBase2.java
  WifiDialog2.java

  WifiConfigController2Test.java
  WifiDialog2Test.java

Bug: 146407136
Test: compile
Change-Id: I0689ae8ddee4f35e3bc104fd0b2e94eb8f689630
2019-12-26 14:45:28 +08:00
Hai Shalom
457203e156 [DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent
Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent to include
additional information in case of a failure. The intent will
return an extra field with result code for R1 and R2 devices,
and additional details for R2 devices: SSID, channe list,
and band list.

Bug: 139381558
Test: Manual test
Change-Id: I6f1805f3b1ff72efc83961083c1311a24d6ebd3e
2019-12-25 20:06:38 -08:00
TreeHugger Robot
69a59c9895 Merge "Settings search - Navigate user to exact page" 2019-12-25 08:13:17 +00:00
Goven Liu
f8e6ba0ff9 Merge "[Wi-Fi] Add a new intent handler process for adding new networks panel page." 2019-12-25 01:55:43 +00:00
Edgar Wang
08f2a58459 Settings search - Navigate user to exact page
- remove duplicate index preference
- default set searchable = false when the preference has fragment
- make some fragments indexable

Bug: 143057584
Test: robotest & manual

Change-Id: I4d64f6106d2f92f0a45e8c7e26388677f593f412
2019-12-24 21:04:11 +08:00
govenliu
d9a414b61e [Wi-Fi] Add a new intent handler process for adding new networks panel page.
For the R feature "Add saved networks to the
device for apps", need to handle the new intent case to update the content to be the specific networks in the new intent.

Bug: 146105504
Test: Add following unit test case to check if UI list had been updated:
      getThreeNetworksNewIntent_shouldHaveThreeItemsInUiList.

Change-Id: Id043fabb16ba5a75aa81be8cacd403e62e5268b8
2019-12-23 18:23:51 +08:00
Hai Shalom
38ab4d342b [DPP R2] Added support for DPP R2 events
Added support for DPP R2 events that provide additional
details about the onboarding process of a remote enrollee.
Specifically, DPP R2 configurator waits for response from
the enrollee, which reports back the SSID, tried channels
and band support in case it cannot find the AP. When it
reports success, then it means that it is acutally connected.

Bug: 139381558
Test: Manual tests with DPP R1 and R2 enrollees
Test: atest DppManagerTest
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Change-Id: If19fc6906ec5abbdceef0742dc52b42c7d0acfe0
2019-12-19 17:57:41 -08:00
Quang Luong
f07f79988d [Wi-Fi] Sync Connect button UI with WifiEntry connected state
The Connect button in the Network Details Page should be synced to the
connected state of WifiEntry and should toggle between not visible,
"Connect", and "Connecting..." accordingly.

Bug: 70983952
Test: manual - connect to in-range saved network through Network Details
page

Change-Id: Id34a840dd81fb99c8e64ad219b0b7af73946c1bf
2019-12-19 15:57:38 -08:00
Ahmed ElArabawy
dafc3fd386 Merge "Wifi: Handle adding 6GHz band to SoftAP" 2019-12-19 02:30:15 +00:00
Arc Wang
8e5f76b57f Merge "[Wi-Fi] Launch WifiNetworkDetailsFragment2 for a connected Wi-Fi network" 2019-12-18 09:02:54 +00:00
Arc Wang
808a9f11f5 Merge "[Wi-Fi] Replace WifiTracker with WifiTracker2 in WifiDetailPreferenceController2" 2019-12-18 09:02:37 +00:00
Arc Wang
ce5e7a4626 [Wi-Fi] Launch WifiNetworkDetailsFragment2 for a connected Wi-Fi network
This change also remove redundant code of WifiNetworkDetailsFragment2
from WifiSettings.

Bug: 143326832
Test: Manual
      Click connected Wi-Fi network and check the UI of
      WifiNetworkDetailsFragment2
Change-Id: Id72c26116177f8e7063e433a6456557bd36c7927
2019-12-18 07:23:14 +00:00
Arc Wang
b60e91bf0b [Wi-Fi] Replace WifiTracker with WifiTracker2 in WifiDetailPreferenceController2
There are still many methods not implemented in WifiEntry. This change has below workarounds:

1. Add WifiEntryShell to provide dummy WifiEntry methods.
2. Add @Ignore to WifiDetailPreferenceController2Test.

Must remove these workarounds after we have more constructed WifiEntry methods.

Bug: 143326832
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.details2
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints2
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ic2edb424b9c645838558fe131991ccb9105dc64c
2019-12-18 15:21:59 +08:00
govenliu
cfd8a5d253 [Wi-Fi] Use new defined proto field for adding new networks panel page.
Use new metric, PANEL_ADD_WIFI_NETWORKS, for proto upload log use.

For R feature: Add a mechanism for apps to add saved networks to the
device, need to apply new metrics category.

Bug: 144891278
Test: Add following test case for testing metric:
      getMetricsCategory_shouldReturnPanelAddWifiNetworks()

Change-Id: I7cde8057c5f2b01c951b1de4203ab1c1a2f0f40a
2019-12-18 13:57:30 +08:00
Xiangyu/Malcolm Chen
e0f40d5948 Merge "Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId" 2019-12-17 01:59:43 +00:00
Ahmed ElArabawy
5120a342ca Wifi: Handle adding 6GHz band to SoftAP
With the support of 6GHz in Android, BAND_ANY is no longer equivalent
to 2GHz+5GHz.
This commit makes the changes to adapt with this.

Bug: 139354972
Test: Manual
Change-Id: I29263573fb900a560494a84df5a16ac0e6948f59
2019-12-16 15:40:57 -08:00
Steven Liu
6c1efb0a80 Merge "Remove those stuff about CarrierAp, they are removed from FW." 2019-12-16 21:33:23 +00:00
Malcolm Chen
26e5dbdbfd Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId
Bug: 140908357
Test: build
Change-Id: Idaa206c7659717a269738c0121a31d957f7d90d0
2019-12-16 11:43:00 -08:00
Ahmed ElArabawy
ead637e0c8 Wifi: Replace dual_band with 5GHz band support
As part of the support of the 6GHz band, the concept of dual-band is no
longer valid since we have more than 2 bands supported by Android and
can be checked on the device.

This commit replaces checks on dual-band support with an explicit check
on 5GHz band support.

Bug: 145936758
Bug: 139354972
Test: Manual
Change-Id: Ia118dedb573f61a148764146edf8091ae253a3e2
2019-12-12 16:36:23 -08:00
Steven Liu
2bd1d93555 Remove those stuff about CarrierAp, they are removed from FW.
Bug: 130875004
Test: atest SettingsRoboTests
Change-Id: I549eabd1699a617dd6e639b725ade361c64d5a67
2019-12-12 10:38:38 -08:00
Arc Wang
5f23a43660 [Wi-Fi] Fix transition mode problems
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()

Bug: 144320676
Bug: 144320649
Bug: 144325162
Bug: 144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi

Change-Id: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
2019-12-06 18:17:07 +08:00
TreeHugger Robot
cdcef1f50c Merge "Wifi Setting: Use SoftApConfiguration for Tether Setting" 2019-12-06 03:29:52 +00:00
Goven Liu
6226188c47 Merge "[Wi-Fi] Add multiple networks request case for adding Wi-Fi for apps feature." 2019-12-06 02:33:25 +00:00
Quang Luong
7719c8e3d8 Merge "Add call to WifiEntry.connect() when tapping on WifiEntryPreference" 2019-12-05 21:03:47 +00:00
govenliu
c45672be54 [Wi-Fi] Add multiple networks request case for adding Wi-Fi for apps feature.
Handle adding multiple networks case, add UI components and process saving flow.

Bug: 136472483
Test: Add unit test cases to test filterSavedNetworks API.
Change-Id: I222e2f8294793796e293de49acdb96ecd6a57b0d
2019-12-05 17:33:51 +08:00
lesl
ff012f03a8 Wifi Setting: Use SoftApConfiguration for Tether Setting
Bug: 145578449
Test: Manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I02b4dcbb7b6e29b67ecc7356200f3fc3a1007562
2019-12-05 17:28:24 +08:00
Quang Luong
cf8856017f Add call to WifiEntry.connect() when tapping on WifiEntryPreference
Bug: 70983952
Test: manual - verifying saved network is connected to when preference
is tapped

Change-Id: Ieca38cfe0e457115c2e0bd832b987582073be7ce
2019-12-04 14:51:29 -08:00
Quang Luong
810f7861f0 Merge "Use WifiPickerTracker to get connected WifiEntry" 2019-12-03 20:03:10 +00:00
Goven Liu
df1118d61c Merge "[Wi-Fi] Add one network request case for adding Wi-Fi for apps feature." 2019-11-29 03:28:05 +00:00
Bonian Chen
9b26611ce1 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 am: 944689abd6
am: 6c1861b3c0

Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
2019-11-28 07:30:09 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
govenliu
7b6b93b4f8 [Wi-Fi] Add one network request case for adding Wi-Fi for apps feature.
Handle adding one network case, add UI components and process saving/connecting flow.

Bug: 136472483
Test: Add unit test cases to test one network in list case and null list case, and also check if the SSID set correct or not.
Change-Id: I99f804a967575538c9dc3f1faabb2b507e92e558
2019-11-28 16:39:06 +08:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
2019-11-27 14:35:07 +01:00
Bonian Chen
a6a4fb2c37 Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434 am: 37e02742a4
am: b61f54519b

Change-Id: Ia60aa3828cb0b4a28e72ae43fb47a09982ae0b5f
2019-11-26 17:51:38 -08:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Goven Liu
a9ba39fb16 Merge "[Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature." 2019-11-22 11:21:07 +00:00
govenliu
d507b56ad1 [Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature.
Add following changes:
1. Add intent receiver.
2. Add panel UI with icon, title, summary.
3. Add two buttons (save and cancel).
4. Add test case for activity and fragment

Bug: 136472483
Test: Add following test cases for checking button and package name in activity and fragment.
      1. AddAppNetworksActivityTest
      2. AddAppNetworksFragmentTest
Change-Id: I5515a96fa3feb0e3e6d68159b2c0dec0894c15ee
2019-11-22 17:02:59 +08:00
TreeHugger Robot
d7ba70ee54 Merge "Revert submission" 2019-11-22 01:42:21 +00:00
Hai Shalom
979b95777a Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
2019-11-21 19:25:46 +00:00
Arc Wang
ade3cc7b49 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" 2019-11-21 05:54:12 +00:00
David Su
f4bb306eec Merge "Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID" 2019-11-20 18:57:28 +00:00
James Mattis
1f3415f36e Merge "Swap param order in registerSoftApCallback"
am: 76632c01fd

Change-Id: Id33581fd71070e23a561ca34e76f0623d66e2852
2019-11-20 10:32:44 -08:00
Arc Wang
41661fe69c [Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
To improve security.

Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2019-11-20 10:59:23 +08:00
James Mattis
def3e9f734 Swap param order in registerSoftApCallback
Moving executor to be the first argument in registerSoftApCallback.

Bug: 144379300
Test: Manually on pixel 3

Change-Id: I5563c1059cc04014a0fd909e2508f7bf497d708e
Merged-In: I5563c1059cc04014a0fd909e2508f7bf497d708e
2019-11-18 13:16:34 -08:00
David Su
68e501f80e Merge "Settings: Clean up WifiManager APIs" 2019-11-18 21:03:41 +00:00