Commit Graph

1625 Commits

Author SHA1 Message Date
Cosmo Hsieh
d4e5f0b89e Merge "[Mac Randomization] Fix perference changing not work and wrong default value" 2019-01-17 00:47:00 +00:00
Xiangyu/Malcolm Chen
4c62693cd0 Merge "Don't show hidden Cellular subscription in Settings." 2019-01-16 22:00:50 +00:00
cosmohsieh
82588849ac [Mac Randomization] Fix perference changing not work and wrong default
value

1. Mac randomization setting would not effect, until reconnecting the network.
Disconnect it and WiFi will soonly connect back.
2. Mac randomization setting of adding network page is default to
"device MAC", correcting to "Randomization"

Bug: 123123123
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I91f8670ddf81aea89354c4cc9c9a7901b8f3409c
2019-01-16 19:45:32 +00:00
Quang Luong
3eac2faa9c Merge changes from topics "osu-at-the-top", "osu-provisioning-support"
* changes:
  Added autoscroll to top when clicking on OSU entry
  Added support for OSU Provider provisioning action on click
2019-01-16 19:10:14 +00:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Hai Shalom
8466751a79 Merge "[DPP] Fix usage of "DPP" public API to "Easy Connect"" 2019-01-15 20:46:44 +00:00
Sunil Ravi
00020f6605 Merge "WiFi: Add Tx and rx link speed in network details" 2019-01-15 18:43:58 +00:00
Johnson Lu
ec18560911 Merge "Implement WifiNetworkListFragment - Part 2" 2019-01-15 15:41:09 +00:00
Johnson Lu
e910c7af60 Merge "Implement WifiNetworkListFragment" 2019-01-15 15:40:54 +00:00
Johnson Lu
98bc9e5384 Implement WifiNetworkListFragment - Part 2
Uses connected access point to start DPP in Configurator-Initiator role directly.

Bug: 118794978
Test: RunSettingsRoboTests
Change-Id: Ie2d5661fdef3588bb597d4a7e4dfe5f981737c84
2019-01-15 13:27:47 +08:00
Johnson Lu
0adba0aa1b Implement WifiNetworkListFragment
1.Scan valid access points for DPP configurator by using WifiTracker.
2.Allow user to add a new network for DPP configurator.

Bug: 118794978
Test: RunSettingsRoboTests
Change-Id: I36504d28dec7d2c9091aa6c35ebe2495045681f7
2019-01-15 13:27:47 +08:00
Sunil Ravi
39d372e676 WiFi: Add Tx and rx link speed in network details
current "link speed" in UI is renamed to "Transmit link speed".
Also Added Receive link speed in network details.

Bug: 120497598
Test: Connected to AP and verified the Rx link speed in Network details.

Change-Id: I01cf7362a27ad78ddfaef68efae4d07cbd14fc55
2019-01-14 16:31:01 -08:00
Hai Shalom
e046e8af2a [DPP] Fix usage of "DPP" public API to "Easy Connect"
All DPP public API and constants renamed to use Easy Connect,
which is the WFA public technology name. Update the settings code to use the
new API names.

Bug: 122851551
Test: atest DppManagerTest
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Change-Id: Ib531393a81526c468c978e31f1c62c5022245d55
2019-01-14 15:49:59 -08:00
TreeHugger Robot
eb372989fd Merge "[WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers" 2019-01-13 16:15:05 +00:00
Hai Shalom
b5c286a4a4 [WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers
Following API Council review:
Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers in all instances
in order to be consistend with existing members.

Bug: 122616519
Test: atest com.android.server.wifi
Change-Id: I42496a0c9fa1034beffd9b05eeafd2f0a75eb1a8
2019-01-10 12:42:46 -08:00
Arc Wang
dcf3f2906f Fix Wi-Fi DPP activity crash after configuration change.
Both QR code and Wi-Fi network data may not come from intent.
After configuration change, the null data will crash the activity.

Bug: 120243131
Test: atest WifiDppConfiguratorActivityTest
Change-Id: I6abbfc5d25431789e8ac9f6ee9dfaaef15b2de33
2019-01-10 12:22:56 +08:00
Arc Wang
a7d51370c8 Implement Wi-Fi DPP flow
1. Wi-Fi DPP hanshake fail UI
2. Show Wi-Fi DPP QR code information field on WifiDppAddDeviceFragment if it's available.
3. Click 'Choose Different Network' button will show WifiDppChooseSavedWifiNetworkFragment
4. After QR code scanner scans success, WifiDppConfiguratorActivity caches WifiQrCode instead
   of just a QR code string

Bug: 122429170
Test: manual test
Change-Id: I1ce1b014ff86903b5a7a8f3575cc98eb1079583c
2019-01-10 12:09:58 +08:00
Quang Luong
d3ba94b332 Added autoscroll to top when clicking on OSU entry
Bug: 118705403
Test: manual, build and click on OSU entry
Change-Id: I78c69e49afc577140b819f2a4e949440a81d63c6
2019-01-09 13:49:55 -08:00
Quang Luong
7f94b17280 Added support for OSU Provider provisioning action on click
Added a call to AccessPoint.startOsuProvisioning() to
onPreferenceTreeClick to open up an OSU provider flow when the user
clicks on an AccessPointPreference pertaining to an OSU provider
AccessPoint.

Bug: 118705403
Test: manual, build and tap on the OSU provider AP.
Change-Id: I3c321c2a6d2336a0cc92a30ae051146d2fc05fb7
2019-01-09 13:49:55 -08:00
Arc Wang
8eda83d071 Add more Wi-Fi DPP UI features.
1. Use ConstraintLayout to fix footer buttons at bottom
2. ScrollViews have all other UI components excepts footer buttons
3. Use style/SuwGlifButton for buttons
4. Fix scan fragment crash when rotating screen

Bug: 118794978
Test: manual test
Change-Id: I509b0156c4835c75da75fb7ac4c82f55a0b506a1
2019-01-09 18:25:31 +08:00
Cosmo Hsieh
1cb7e12fab Merge "Implement persisting time for onUserSelectionConnectSuccess." 2019-01-09 02:28:09 +00:00
Johnson Lu
9c092dda62 Merge "Implement Wi-Fi DPP flow" 2019-01-09 01:59:01 +00:00
Johnson Lu
7bdf8b3d37 Implement Wi-Fi DPP flow
1. As DPP configurator initiator.
2. As DPP enrollee initiator.
3. Pass whole DPP url to DPP API due to API cahnged.

Bug: 122331217
Test: manual test
Change-Id: I8005b78b82453badf253dbde8022ff20722b39fd
2019-01-08 13:42:42 +08:00
cosmohsieh
c1854cae9a Implement persisting time for onUserSelectionConnectSuccess.
When onUserSelectionConnectSuccess callbacks, holding a second for user
to be aware of success connection. Then, go to destory network request dialog.

Bug: 117399926
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestDialogFragmentTest
Change-Id: I12d8fb2e8955cf24ddad43d1fe8b863682b6ae32
2019-01-08 12:08:11 +08:00
Salvador Martinez
1517be0b7f Remove logging for ssids
This is potentially PII so we should not log this. This change
simply removes the lines of logging code.

Test: changing preference does not result in logging
Bug: 117637133
Change-Id: I620ac4cc4eaaf8227b0694e6cc5f9a85d54bc0e8
2019-01-07 14:35:31 -08:00
TreeHugger Robot
af2c9b2646 Merge "Fix ConcurrentModificationException in SliceBackgroundWorker" 2019-01-07 20:11:17 +00:00
Jason Chiu
e19658ac36 Fix ConcurrentModificationException in SliceBackgroundWorker
- Two different threads could call SliceBackgroundWorker.getInstance()
  at the same time and caused ConcurrentModificationException
- Add a new API overloading getInstance for each slice to get a nullable
  worker since there is no result data then
- Only slice provider can create a new worker instance in main thread

Test: robotest
Change-Id: I560529bb6034ec22263418adeb7f3ccebf879196
Fixes: 121043385
2019-01-07 20:10:49 +00:00
Arc Wang
c8cd5d3834 Add more Wi-Fi DPP UI features.
1. Update strings and icons.
2. Add more UI features in WifiDppAddDeviceFragment &
   WifiDppChooseSavedWifiNetworkFragment.

Bug: 118794978
Test: manual test
Change-Id: I2bee3f66732a1083fb13c113695899272e98c23e
2019-01-04 12:17:02 +08:00
Arc Wang
8e580952c3 Change action WIFI_DPP_CONFIGURATOR_CHOOSE_SAVED_WIFI_NETWORK to
PROCESS_WIFI_DPP_QR_CODE for more intuitive naming.

This change also caches the Wi-Fi DPP QR code in activity for
fragment to use.

Bug: 118794978
Test: manual test
Change-Id: I4bdb021883cb21ce7cc56edf656d1eee079359e5
2019-01-04 09:59:40 +08:00
Lei Yu
0e66037fc1 Merge "Add lost prefController to WifiTetherSettings" 2019-01-02 23:07:08 +00:00
jackqdyulei
5ca4e06dfe Add lost prefController to WifiTetherSettings
One controller is lost during a refactor(ag/4774003), this CL adds
it back.

Change-Id: Ie50a3ac009f302d4fd7a179117fe026031cc1ae8
Fixes: 122235175
Test: RunSettingsRoboTests
2019-01-02 11:30:03 -08:00
Arc Wang
221b7e0b77 Refine Wi-Fi DPP fragments.
1. WifiDppQrCodeBaseFragment only declairs common UI components between fragments.
2. Initiate UI components in onViewCreated of each View.
3. Remove the only one usage of @NonNull since it should be used consistently
   throughout the class if we want to use it.
4. Use android.R.id for icon/title/summary

Bug: 120645817
Test: atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: I54f99a3072533cec46f0e47753ee0331fecf2ada
2019-01-02 07:13:10 +00:00
Arc Wang
1988fb75c6 Implement Wi-Fi QR code scanner flow.
1. Implements WifiNetworkConfig Wi-Fi connection method
2. Shows error message when the QR code is not valid and hides it after 2s
3. In configurator mode, launchs AddDeviceFragment for a valid QR code
4. In enrollee mode, connects Wi-Fi for a valid QR code

Bug: 118794978
Test: manual test
      atest WifiQrCodetest
      atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: Ie4731b22df295c60906156d33ea28dad9c084ce4
2019-01-02 07:12:15 +00:00
Arc Wang
cc8212edf6 Add connect() method in WifiNetworkConfig to connect Wi-fi.
This method uses data of ZXing Wi-Fi QR code to connect.

Bug: 118794978
Test: manual test
Change-Id: I249f2f638c8d2fe231c50ba50eae8dfc0dc40a5c
2019-01-02 06:08:09 +00:00
Arc Wang
87c40f3b60 Fix ZXing Wi-Fi QR code parsing bug.
ZXing Wi-Fi QR code uses ';' as the delimiter for key/value pairs,
should not treat an escaped "\;" as the delimiter.

This fix also change the parsing result:

  If there is no specified key, the result value is null.
  If specified key exists with empty value, the result value is an empty string.

Bug: 118797380
Test: atest WifiQrCodetest
Change-Id: I786ce7c4fa66dcb31d8a61d7a3251c2f539ccc99
2019-01-02 06:07:46 +00:00
Cosmo Hsieh
06c514db6f Merge "Change privacy setting string" 2019-01-02 05:40:11 +00:00
Johnson Lu
0b0dec957d Refine decorate view of QR Code scanner
1.Draw rounded corner line.
2.Paint 70% white transparency background.

Bug: 118797380
Test: make RunSettingsRoboTests
Change-Id: I1192e32cf4ec801a3efcad4287c2e547deeac3bf
2019-01-02 03:14:12 +00:00
cosmohsieh
a83b304670 Change privacy setting string
Change privacy setting (mac randomized) string

Test: manual and robotests
Change-Id: I264c89e0b8ccaeff0a057ff7d791d006a5e7d7cd
2018-12-28 10:07:20 +08:00
Johnson Lu
7414543635 Show QR Code picture for WiFi sharing
Bug: 118794858
Test: make RunSettingsRoboTests
Change-Id: Ic5a489840ba59262eb444f02d77bf066889a4220
2018-12-27 09:55:44 +08:00
TreeHugger Robot
4bd75b0715 Merge "Implement QR code parser WifiQrCodetest." 2018-12-20 10:05:26 +00:00
Arc Wang
e1b6712926 Implement QR code parser WifiQrCodetest.
The parser supports standard WI-Fi DPP QR code & ZXing reader library's
Wi-Fi Network config format.

Bug: 118797380
Test: atest WifiQrCodetest
      atest RunSettingsRoboTests

Change-Id: Ia47b8f65a900099749a6aa24afa3abd21ede1582
2018-12-20 15:12:34 +08:00
TreeHugger Robot
9f7927f6d5 Merge "Hide wifi card sometimes." 2018-12-19 17:42:58 +00:00
Fan Zhang
0db4ead2b3 Hide wifi card sometimes.
When there is a connected wifi, we now hide the wifi slice card.

However, if we initially shows this card but later wifi is connected
while the card is visible, we keep showing this card to avoid janky
animation. The card will be gone if user nagivates to a different UI and
comes back.

- Create a new slice ContextualWifiSlice for homepage use case, all
  special logic for homepage are added here.
- Change reference for WIFI_SLICE to CONTEXTUAL_WIFI_SLICE where make
  sense.

Change-Id: Ibd87f88058f357aabef0f7d68a5bf48350d75b06
Fixes: 121040746
Test: robotests
2018-12-18 10:18:08 -08:00
Arc Wang
9dbc040510 Merge "Fine tune UI layout files of WifiDppQrCodeScannerFragment & WifiDppQrCodeGeneratorFragment" 2018-12-18 07:26:47 +00:00
Cosmo Hsieh
0c4214a200 Merge "Add internal WifiTracker to get correct AccessPoint for WifiNetworkRequestDialog" 2018-12-18 06:15:35 +00:00
TreeHugger Robot
17b0c03d5b Merge "Add wifi connection info to the multi-network header" 2018-12-18 03:54:35 +00:00
cosmohsieh
65c8d1df69 Add internal WifiTracker to get correct AccessPoint for
WifiNetworkRequestDialog

Use WifiTracker to get correct and constantly updated Wifi status of AccessPoint.

Bug: 117399926
Test: RunSettingsRoboTests
Change-Id: I5e4316f6acb7787dcaab150a293068852beb76e0
2018-12-18 10:40:54 +08:00
Arc Wang
504aedb708 Merge "Support Wi-Fi DPP metrics categories in Wi-Fi DPP activities & fragments." 2018-12-18 02:30:36 +00:00
Arc Wang
fb0a081848 Fine tune UI layout files of WifiDppQrCodeScannerFragment &
WifiDppQrCodeGeneratorFragment

    1. Remove footer in landscape QR code scanner fragment
    2. Move header icon from activity layout file to header layout file
    3. Fine tune header layout file
    4. set icons for the 2 fragments

Bug: 118797380
Bug: 118794858
Test: atest WifiDppConfiguratorActivityTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest RunSettingsRoboTests

Change-Id: I7e547d7c29dd947a890e902e61b8244fec399354
2018-12-18 02:23:22 +00:00
Johnson Lu
802363363f Merge "Adjust camera preview area to square" 2018-12-18 01:13:14 +00:00