Commit Graph

1924 Commits

Author SHA1 Message Date
lucaslin
570f7dbc4b Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.

Bug: 113242081
Test: make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest

Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
2019-09-26 15:55:01 +08:00
Antony Sargent
e4e1f08781 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am: 3288037bd2

Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
2019-06-25 23:02:14 -07:00
Antony Sargent
46d819272a Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.

The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.

What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.

The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.

As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.

Fixes: 135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
2019-06-25 14:16:53 -07:00
Arc Wang
9b971efd6b Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am: d64b6c8846

Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105
2019-06-19 19:38:57 -07:00
Arc Wang
d64b6c8846 Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev 2019-06-20 01:34:09 +00:00
Arc Wang
c58b3aaf0f Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am: d8916ef151

Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56
2019-06-19 10:14:55 -07:00
TreeHugger Robot
d8916ef151 Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev 2019-06-19 16:54:35 +00:00
Arc Wang
00c8b534cd [Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail
After a user uses Wi-Fi QR code scanner to scan a QR code of an unreachable
Wi-Fi network, the scanner does not recognize any QR code until the scanner is
restarted or back from a screen off state.

To restart QrCamera after a Wi-Fi QR code recognition, we should stop it before
start, otherwise the DecodeTask will not work.

Bug: 135225856
Test: Scan a Wi-Fi QR code of unreachable Wi-Fi network and
      scan a Wi-Fi QR code of reachable Wi-Fi network, check
      if the scanner recognizes QR code.

Change-Id: I0063c867d8e4046f184d02134bda842887c003a1
2019-06-19 10:01:17 +08:00
Arc Wang
751eba205b [Wi-Fi DPP] Support WPA2/WPA3 transition mode
This change shows buttons of QR code scnanner and QR code generator
for a connected Wi-Fi network.

Bug: 134706055
Test: Generate QR code for a WPA2/WPA3 personal transition mode Wi-Fi AP
          and check if the security type is WPA2 personal.
      Generate QR code for open network.
      Generate QR code for OWE network.
      Scan a QR code of open network, verify connection.
      Scan a QR code of OWE network, verify connection.
      Scan a QR code of WPA3 network, verify connection.
      Scan a QR code of WPA3 network, verify transition mode connection.

Change-Id: I60f2c38585f85745f992fa63a5ea85312f08c5e5
2019-06-11 15:10:43 +08:00
Lorenzo Colitti
4bee989ec1 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I556ca5d18af9ea673216d63bef71ee9ca66d66ad
2019-06-07 23:51:32 -07:00
Lorenzo Colitti
5456b596a2 Disconnect if the user cancels the no/partial connectivity dialog
If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.

Bug: 130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012
2019-06-07 19:43:24 +09:00
Arc Wang
96a7bcafb6 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
am: 7d7353c3b5

Change-Id: Ia366acf4c94763fa4836fe2d98c7b4e0abc86ac8
2019-05-24 07:52:31 -07:00
Arc Wang
7d7353c3b5 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev 2019-05-24 14:36:44 +00:00
Arc Wang
352d866af7 Fix Wi-Fi QR scanner crash problem
1. Should only set picture size from the list of supported picture sizes.
   To choose the best picture size, we should keep ratio as preview size to
   avoid image distortion and QR code scan failure.

2. When Camera#setOneShotPreviewCallback callbacks, the image data is of
   preview size, not picture size.

Bug: 132866467
Test: QrCameraTest
      manual
Change-Id: I087e5fcdf064f111e915e0872b50ca5a45ff1d26
2019-05-24 14:43:06 +08:00
Arc Wang
55f4c5eb65 Merge "Fix Wi-Fi QR code decode fail" into qt-dev
am: 27d09aeb0c

Change-Id: I9345c2aa577871b3c3fc22ac6960708dac268f5c
2019-05-23 22:19:45 -07:00
Arc Wang
27d09aeb0c Merge "Fix Wi-Fi QR code decode fail" into qt-dev 2019-05-24 01:56:42 +00:00
tmfang
b50bdf2c13 Merge "Fix overlapping problem on wifi detail screen" into qt-dev
am: f59844570e

Change-Id: Ic7723df5c956208c71945dc2c0008fe4872a529b
2019-05-23 07:43:09 -07:00
Arc Wang
0d706f0047 Fix Wi-Fi QR code decode fail
ZXing generate QR code with default encoding ISO-8859-1,
the generated QR code is wrong encoded if there is a
character outside of the charset.

Generate QR code of UTF-8 encoding.

Bug: 131851854
Test: manual
Change-Id: I96a5e72a978c654b62d89b3b11dd3016bf0ee1df
2019-05-23 20:41:45 +08:00
tmfang
2ff083c2f1 Fix overlapping problem on wifi detail screen
If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.

So, user sees overlapped problem while user is scrolling view.

For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.

Test: visual and robo test
Fixes: 133380109
Change-Id: I0445c6aeaa42d798374d2c712e9611a09a6b55e7
2019-05-23 15:27:14 +08:00
Fan Zhang
909b2192cb Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b

Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
2019-05-17 16:43:01 -07:00
Fan Zhang
a10d3cfc78 Fix view overlap in wifi dpp enrollment.
Fixes: 132813855
Test: visual
Change-Id: I5415b8edaf1ce5ae122e4d1ee41e65ca825f72e6
2019-05-17 12:58:50 -07:00
Colin Cross
341544f133 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp 2019-05-14 23:33:25 +00:00
TreeHugger Robot
ae6f6ab00a Merge "[OWE] Support OWE in transition mode" into qt-dev 2019-05-14 13:57:05 +00:00
TreeHugger Robot
8bc21da216 Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev 2019-05-14 04:44:27 +00:00
Hai Shalom
98aa52dbec [OWE] Support OWE in transition mode
Support OWE in transition mode for devices with OWE support
and devices without OWE support. Scan results will return a
new type of network for OWE in transition networks on devices
that support OWE, and Open for devices that don't support OWE.
Handle the case where Open network is manually added to a device
that supports OWE.

Bug: 132139642
Test: Device with OWE: Connect to Open, OWE-Transition, OWE networks
Test: Device without OWE: Connect to Open, OWE-Transition
Test: Manually create Open network, connect to OWE-Transition
Change-Id: I1a584ccbfec8507803c527ea13933cff6f699ccb
2019-05-13 15:37:44 -07:00
Colin Cross
807e861105 Use if instead of switch for resources
Converting to Soong will move some code from directly compiled
into the app to compiled into an Android library and then
shared between the app and the tests.  This will cause resource
IDs in the library to become non-final, which means they can
no longer be used in case statements.  Convert affect case
statements to if blocks.

Test: m RunSettingsRoboTests
Change-Id: I25742a374f06d3fa4decbfc0d223a350acc50881
2019-05-13 13:42:01 -07:00
TreeHugger Robot
6a3eb31763 Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev 2019-05-13 18:58:44 +00:00
TreeHugger Robot
26ff84d3f4 Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev 2019-05-13 07:10:11 +00:00
TreeHugger Robot
b2fcb7825e Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev 2019-05-12 02:43:06 +00:00
Jason Chiu
2c3e6c6434 Fix automatically directing the user to the captive portal in Wi-Fi Slice
The feature failed after the CL "Force the adapter to rebind cards with
a toggle".

Because toggle slices have been forced to rebind after starting another
activity and when any slice is updating. This unpins Wi-Fi slice and
stops WifiScanWorker and then clears the saved clicked network.

Solution:
1. Change ConnectToWifiHandler from activity to receiver and send
   broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't
   be forced to rebind.
2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the
   original logic for the generic one, and then add the logic below to
   the contextual one.
3. Do not clear the saved clicked network when slice is unppined because
   it happens frequently in contextual homepage.
4. Introduce a static long in ContextualWifiScanWorker that updates once
   in every visible UI session. A session is when the screen is visible
   to user.
5. Use session token to determine whether auto-starting captive portal
   is needed.

Fixes: 128056349
Test: robotest, visual in homepage and network panel
Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
2019-05-11 03:26:57 +00:00
Hai Shalom
3fc9dc3ada [WPA3] Fix connectivity issues with PSK-SAE Transtion mode
Fix two reported issues regarding PSK-SAE transition mode:
1. When phone supports SAE, creating a manual saved network with PSK
and manually connecting would cause the phone to connect but Settings
does not display any connected AP. Phone would not autoconnect.
2. When phone doesn't support SAE, phone cannot connect to an AP in
PSK-SAE Transition mode because the framework always targets the highest
security.

Bug: 132278271
Test: Connect to WPA2 network
Test: Connect to WPA3 network (w/capable phone)
Test: Connect to WPA2/3 Transition w/SAE capable phone
Test: Connect to WPA2/3 Transition w/SAE not-capable phone
Change-Id: I371bcb4b2cccfc8684ecb5db3a768524f7354598
2019-05-10 12:59:23 -07:00
Arc Wang
454553ed52 Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"
We should make sure both 'Use location' & 'Wi-Fi scanning' are enabled
before calling setWifiWakeupEnabled.

Bug: 131777439
Test: manual
Change-Id: I602917cfa7c5581ecb414e8c44b4e20c8f9ea78d
2019-05-10 14:13:07 +08:00
Jason Chiu
46294872c7 Remove On/Off subtext next to the Wi-Fi toggle
Fixes: 132312797
Test: robotest, visual
Change-Id: I2c3b39e8deda211d23be0b2a73426778dbbf53db
2019-05-09 15:19:02 +08:00
Arc Wang
5c461a2859 Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev 2019-05-09 01:29:48 +00:00
Arc Wang
1d2527061a Fix Wi-Fi QR code scanner height at 360dp
To avoid error message cut on small screen devices

Bug: 131628795
Test: manual
Change-Id: I33fa55da22823064608739bed33cdd287bffa0b8
2019-05-08 11:43:22 +08:00
Bram Bonné
db6a70272e Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev 2019-05-07 14:02:04 +00:00
Arc Wang
ac75faa207 Fix back arrow in wifi settings "connect to this network connection qr code" does not work
When clicking back button, pop fragment and Finish the activity if there is nothing to pop

Bug: 132132756
Test: atest WifiDppConfiguratorActivityTest
Change-Id: Ia16951e79e578f1625e5fadd26553735fa90bffa
2019-05-07 18:06:54 +08:00
TreeHugger Robot
a892ed5cdd Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev 2019-05-07 02:45:19 +00:00
Bram Bonné
5d8d2fa5a8 Adapts P2P settings to work with with new MAC privacy restrictions.
With change ag/7340724, the device's P2P MAC adress will no longer be
included as part of the WIFI_P2P_THIS_DEVICE_CHANGED_ACTION broadcast.
This change makes WifiP2pSettings request the device info after
receiving that broadcast, to make it aware of the device's MAC.

Bug: 132055766
Test: atest
/media/sdb1/android/packages/apps/Settings/tests/robotests/src/com/android/settings/wifi/p2p/
Test: Open Wi-Fi Direct settings, clear device name, observe that the
device's MAC is displayed.

Change-Id: I524afb0c8061c90cd775af422b542213cf14640a
2019-05-06 14:29:44 +00:00
Amin Shaikh
3f1de20c7e Fix themed settings icons.
- Added android prefix for homeAsUpIndicator attribute
- Override ic_arrow_down_24dp from androidx
- Remove ic_lock drawable overlay
- Update date and time icon
- Dedupe ic_menu_add and ic_add_24dp

Bug: 131346125
Test: mp settings;
Change-Id: I7223249f2adccc5569a37e8b68cae5499e7c7620
2019-05-03 17:02:46 +00:00
Jason Chiu
6a6787cdc0 Add subtext for Wi-Fi items on Wi-Fi slice
- Sync the Wi-Fi slice items subtexts with Wi-Fi page, and add
  "Not connected" when the returned subtext is empty
- Wi-Fi slice header subtext just simply reveals on/off state
- Add a placeholder to the loading row to sync its height with other
  rows
- Show contextual Wi-Fi slice when the connected network is captive
  portal, is invalidated, or has limited connectivity

Bug: 130751985
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I0b2715295f00edc8dd7d6d75b7fdc18263675797
2019-05-03 16:18:42 +08:00
TreeHugger Robot
4653879a22 Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev 2019-05-01 15:48:41 +00:00
cosmohsieh
636ad9d947 Fix modification of WifiDialog doesn't take effect on details page
When clicking modify menu option in detiails page, modification on
metered or privacy preferences in the WifiDialog does not effect
back to details page but only changing internal data of WifiDialog.
Adding callback to update those two preferences.

Bug: 130775713
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I74bfa5a9581dfae73894c3e9f73d1069a36fd16b
2019-04-30 09:32:27 +08:00
Pasty Chang
54cddc70e5 Merge "Set QR scan activity to light theme in setup flow" into qt-dev 2019-04-29 01:52:11 +00:00
Clown SHEN
fbcf3708a6 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev 2019-04-27 06:42:45 +00:00
clownshen
0d5928f6f1 Show "Disconnected" instead of "Saved" in detail page summary
To improve UX, show summary as "Disconnected" is more make sense to end
user instead of "Saved" in detail page, it's decision-maker to click
connect button.

Bug: 131119614
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest

Change-Id: I26ea0c566daab6214a596509f972005fd37fab4d
2019-04-25 08:15:13 +00:00
clownshen
dd4764b7f4 Fix NPE when connect timeout
If user click connect button and then receive timeout event after leave
detail page, the NPE happened. Ignore the timeout event if activity
already gone.

Bug: 131141866
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: Ic22c22027386d4a6de5d693eafcd9cd463ed3415
2019-04-24 06:10:18 +00:00
TreeHugger Robot
79f75e483f Merge "Add action metrics for Wi-Fi provision features" into qt-dev 2019-04-23 17:36:54 +00:00
pastychang
ec0a30a8b9 Set QR scan activity to light theme in setup flow
Test: atest
Bug: 131029518
Change-Id: Ibec28e78fcf17390cd3844ead4a88a4e6bff6094
2019-04-23 13:38:39 +00:00
TreeHugger Robot
805e208f14 Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev 2019-04-23 11:47:21 +00:00