Commit Graph

421 Commits

Author SHA1 Message Date
Antony Sargent
02db2ef9b6 Go to the correct subscription in WifiCallingSettings
For subscriptions that support wifi calling, we have a preference on the
mobile network details page which leads to a Wifi Calling page. That
page already supports the concept of multiple subscriptions with a
header strip containing a tab for each subscription that supports wifi
calling. However, we were not necessarily selecting the *correct* tab
when going to this page. So you might be viewing the mobile network
details for subscription B and click on "Wifi Calling", only to land on
the page with the tab for subscription A selected.

This CL fixes the problem by adding an extra with the current
subscription id to the Preference's intent in
WifiCallingPreferenceController, and then reads that extra in
WifiCallingSettings and uses it to select the appropriate tab.

Fixes: 117135894
Test: make RunSettingsRoboTests
Change-Id: I3aec30072712247d14fe0fb6b61207535f9e981c
2019-04-09 16:08:04 -07:00
clownshen
6ef1eec2e2 Redraw WiFi detail page's header icon
Tint 87% dark in day mode and 100% white for night mode

Bug: 129413562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: Ia31231ca7871ac4efcea5e1232690ff4374df5b3
(cherry picked from commit 86f65ef488)
2019-04-09 02:20:32 +00:00
TreeHugger Robot
f32d29b730 Merge "Update wifi p2p to direct user to enable location" into qt-dev 2019-04-05 07:59:44 +00:00
Salvador Martinez
d25ba81028 Update wifi p2p to direct user to enable location
Location is required for Wifi Direct so if it is not enabled
we disable the preference. Additionally, this fixes some minor
update issues in Wifi Wakeup that was also affecting wifi p2p.
Basically they weren't updating when location settings changed
until you left the screen and came back. Now they do.

Test: robotests, manual
Bug: 120552223
Change-Id: Ibd386fcfbef881cae3d871152675f1cab5e4a041
2019-04-04 23:45:04 +00:00
Jason Chiu
8f6c06974c Add prompt to sign in at captive portal to Wi-Fi Slice
- Support signing in captive portal APs in WifiSlice
- Show ContextualWifiSlice when signing in is required
- Generifies SliceBackgroundWorker.getInstance() to return <T extends SliceBackgroundWorker>

Fixes: 128056349
Test: make RunSettingsRoboTests -j
Change-Id: Ib4d3942591a65e81018389e4c0bbddfea6854dbc
(cherry picked from commit dd9f92280b)
2019-04-04 16:51:02 +00:00
clownshen
fafdfea72c Add Wi-Fi data usage field
Add Wi-Fi data usage field at Wi-Fi Setting to show out the total Wi-Fi
data usage for user.

Bug: 129474341
Test: atest WifiSettingsTest
Test: manual test
Change-Id: Iad5bee47bd83ed143a2730f042d77907344f4017
2019-04-03 17:04:36 +00:00
Clown SHEN
8cc371e643 Merge "Only show Sign In button for connected network" 2019-04-03 02:16:05 +00:00
TreeHugger Robot
1dea397256 Merge "Show the disclaimer for WFC emergency call limitation" 2019-04-02 19:58:42 +00:00
Quang Luong
cd0e0d79c5 Merge "Removed Write to NFC dialog" 2019-04-02 17:19:21 +00:00
TreeHugger Robot
abc3e8374e Merge "Add Wi-Fi connect listener in ConnectToWifiHandler" 2019-04-02 08:42:30 +00:00
clownshen
5c2637d6d0 Only show Sign In button for connected network
The Sign In button may appeared in details page for disconnected network
if current network is Captive Portal network. Should hide the button
for disconnected network.

Bug: 129514576
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: I8b4f79e7ba731ce83c49576fffd3e78a27598be3
2019-04-02 08:38:50 +00:00
Clown SHEN
531a87bfd5 Merge "Add test cases for disconnected/not in range network" 2019-04-02 08:38:05 +00:00
Jason Chiu
1b5f5ef510 Add Wi-Fi connect listener in ConnectToWifiHandler
- Extract the connect listener from WifiSettings
- Add a listener to display a toast on failure to connect in ConnectToWifiHandler
- Also for the new AccessPoint.startOsuProvisioning() which accepts a connect listener

Bug: 123697580
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I29b2c1e2c58312d692675ecabf2818b4bbed3b51
2019-04-02 13:44:08 +08:00
clownshen
38f4acf77f Add test cases for disconnected/not in range network
Since detail page support to display for saved network which connection
state may be disconnected or not in range, add more test cases for this
new change.

Bug: 124707751
Test: atest WifiDetailPreferenceControllerTest passed
Change-Id: Ia6426ed6336c09f387317c5597f8deb14c1a9502
2019-04-02 03:13:43 +00:00
Hao Zhang
ec20de3eba Show the disclaimer for WFC emergency call limitation
The emergency calls might not work properly via wifi calling, especially
in areas with no 2G/3G coverage. Display the disclaimer for the this
limitation when a user enabled the wifi calling setting.

Test: manual - Checked that the disclaimer for emergency call limitation
is shown when changing wifi calling setting to turned on.
Test: auto - Passed EmergencyCallLimitationDisclaimerTest.
Bug: 68115846

Change-Id: I881d479c1e02525ac614c66594637a5e0347d70c
2019-04-01 17:09:41 -07:00
Quang Luong
619211cd9e Merge "Added connect listener to startOsuProvisioning()" 2019-04-01 17:55:36 +00:00
Jason Chiu
53d147dd5c Refactor WifiScanWorker
Extracted WifiScanWorker from WifiSlice

Bug: 128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.slices
Change-Id: I9b3c809ee6c2b7466c959631840b257b91b49d88
2019-04-01 16:40:59 +08:00
Quang Luong
83b814742a Removed Write to NFC dialog
Write to NFC dialog should be removed since WPS isn't supported anymore

Test: atest WifiSettingsTests
Bug: 112745354
Change-Id: I2bccf0b234c5f3138c48700904c2d578072e8cd6
2019-03-29 16:12:32 -07:00
TreeHugger Robot
d34b2a9697 Merge "Add SSID to Network Details page for Passpoint" 2019-03-28 22:12:33 +00:00
Quang Luong
1859a19302 Added connect listener to startOsuProvisioning()
Updated AccessPoint.startOsuProvisioning() call to accept a connect
listener to display a toast on failure to connect.

Bug: 123697580
Test: build
Change-Id: I0f29b2f5ccc8f2d4b8137639725dca1bcb106b26
2019-03-28 13:09:37 -07:00
Quang Luong
a2297dc1d1 Add SSID to Network Details page for Passpoint
Added SSID to Network Details page under the Advanced portion only
when the network is for Passpoint, whose network title is not the
SSID of the underlying connected AP.

Bug: 129092023
Test: atest RunSettingsRoboTests

Change-Id: I13308d46e727fc01fec7a079d8e32ab9f1763e21
2019-03-28 11:54:19 -07:00
Quang Luong
d832dcc7c5 Disable Mac randomization setting for Passpoint networks
Mac randomization setting should be greyed out in the network
details page for Passpoint networks.

Bug: 129279500
Test: atest WifiPrivacyPreferenceControllerTest
Change-Id: I4fc89ddbca839c4859f11f8fad212b3e0e4aa7ce
2019-03-27 15:28:34 -07:00
clownshen
c085f18cf1 Fix broken test in WifiDetailPreferenceControllerTest
Bug: 129292549
Test: atest WifiDetailPreferenceControllerTest
Change-Id: Idd8764425816b6851efd5cb716bc968e19b06ea0
2019-03-27 15:03:07 +08:00
Jason Chiu
5b15c6748e Fix broken tests in WifiSliceTest
Fixes: 129293669
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.slice
Change-Id: I70bbeb1fcf01ff0569c937c5dd5c9cfa2e8f9b3c
2019-03-26 14:29:41 +08:00
Raff Tsai
b0bb2f36a1 Merge "Fix broken settings tests" 2019-03-26 05:16:21 +00:00
jackqdyulei
4dbcdd632f Fix broken settings tests
1. Mark a few as Ignore with bug number
2. Remove some tests since it is covered in other places
3. Fix some tests

I think we should make tests at least green asap.

Bug: 129159331
Test: RunSettingsRoboTests
Change-Id: I90971b416806e4e9be249b06ad5abfb73d9d7c23
2019-03-25 15:54:47 -07:00
Hall Liu
928d2abc57 Merge "Show the disclaimer regarding WFC location privacy policy" 2019-03-23 02:13:33 +00:00
TreeHugger Robot
4a6b8a608c Merge "[Network Connection] Implement Unavailable callback when the user cancels" 2019-03-21 05:48:17 +00:00
Lucas Lin
f32823bc6d Merge "Modify dialog message for partial connectivity" 2019-03-21 02:34:03 +00:00
cosmohsieh
5944fa9427 [Network Connection] Implement Unavailable callback when the user cancels
UI should invoke NetworkRequestUserSelectionCallback.reject() callback when the user clicks cancel.

Bug: 128876386
Test: atest NetworkRequestDialogFragment
Change-Id: Ia5faedf8cc7113a602a4cda10b3252d02c3c8876
2019-03-21 09:37:49 +08:00
Cosmo Hsieh
64df6a3073 Merge "[Network Connection] Implement new UI changing" 2019-03-20 04:34:25 +00:00
lucaslin
7335c594be Modify dialog message for partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.

Bug: 113450764
Bug: 128489091
Test: 1. Build pass.
      2. make -j44 RunSettingsRoboTests
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
      3. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.

Change-Id: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
2019-03-20 11:41:21 +08:00
Arc Wang
e4359a9eee Merge "Fix Wi-Fi Easy Connect buttons UI defects" 2019-03-20 01:53:24 +00:00
Arc Wang
baf002d61a Fix Wi-Fi Easy Connect buttons UI defects
1. Apply attr/colorAccent to button icons for theme UI control
2. Apply attr/selectableItemBackground for button tapping ripple effect
3. Use ConstraintLayout to separate ssid EditText and scan button
4. Remove ButtonPreference and add AddNetworkPreference.
   ButtonPreference's naming and design look like a general purpose UI
   component but it's not. This change refactors the code.
5. In AddNetworkPreference, use settingslib layout file
   'preference_access_point' to fix UI alignment problems.

Bug: 126964552
Bug: 125434239
Bug: 126762937

Test: manual test
      atest com.android.settings.wifi.WifiSettingsTest
Change-Id: Ib899a1e10f96bb8427ff00d6b5dfca37a0642c44
2019-03-19 16:27:04 +08:00
cosmohsieh
b795dcbcd1 [Network Connection] Implement new UI changing
1. Change title to multi-lines display
2. Add "SingleSpecifiedSSID" mode, will have connect button
3. Don't pop error dialog, if there is connection failure. Let user
retry.
4. Hide progress icon if list item exists

Bug: 128586511
Test: atest NetworkRequestDialogFragmentTest
Change-Id: Icc560e4882fbcd941574e44690a27d5082a7c4c7
2019-03-19 10:15:33 +08:00
Yong Shi
a37337349c Show the disclaimer regarding WFC location privacy policy
In some countries the rules is very strict about responsibility and
liability around location data during emergency calls. The purpose of
this feature is to notify end user that the location information will
be shared for calls over wifi calling.

Test: manual - Checked that WFC locatopn privacy policy is shown when
changing wifi calling setting to turned on.
Test: auto - Passed LocationPolicyDisclaimerTest.
Bug: 67872298

Change-Id: I03895743fb8da95269069ad7eda9a7b3e282857e
2019-03-18 20:42:04 +00:00
Jason Chiu
d4ab14969f Merge "Fix the bug of "Connecting" is rarely appearing on Wi-Fi slice" 2019-03-18 10:13:56 +00:00
Jason Chiu
4e42f53896 Fix the bug of "Connecting" is rarely appearing on Wi-Fi slice
- AccessPoint treats connected and connecting as equal so slice doesn't
refresh in this case
- Add a new method to determine if two lists are the same in SliceBackgroundWorker
- WifiScanWorker overrides this method to check the access point states

Fixes: 123941320
Test: robotest
Change-Id: I78d610da4b6b1d40f5785ba6701fb71b987fe31c
2019-03-18 16:01:48 +08:00
Hall Liu
c776acee06 Merge "Base implementation of WFC disclaimer UI" 2019-03-15 22:57:06 +00:00
TreeHugger Robot
a63fd33c0b Merge "Tie ContextualWifiSlice to UI instead of garbage collector" 2019-03-15 21:41:29 +00:00
manabu, shimoda
9fae73915c Base implementation of WFC disclaimer UI
Test: manual - Check that no error occurred when changing the wifi
calling settings to turn on.
Test: auto - Passed WifiCallingSettingsForSubTest,
WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest.
Bug: 67872298

Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e
2019-03-14 14:58:20 -07:00
Fan Zhang
4cb2727989 Tie ContextualWifiSlice to UI instead of garbage collector
- Introduce a static long in SliceFeatureProvider that updates once
  every "session". A session is when user is in an UI (screen rotation,
  going to subpage, etc does not break the continuation of session).

- Use session token in ContextualWifiSlice to determine when to refresh,
  instead of relying on WeakHashMap from CustomSliceManager.
  WeakHashMap can be cleaned up at any time by gc so it doesn't match
  what we want on the UI.

- Also as a side fix, merged CustomSliceManager into
  SliceFeatureProvider.

Fixes: 123937830
Test: robo
Change-Id: I199bceceb208b99a32f3f08e624787b5a03e73a9
2019-03-14 14:45:59 -07:00
TreeHugger Robot
0e08cfa095 Merge "Reduce scope for some methods in SliceFeatureProvider" 2019-03-14 19:15:49 +00:00
Cosmo Hsieh
135d90ac9b Merge "[Passpointv2] Implement DataUsage header for Wi-Fi detail fragment" 2019-03-14 10:10:54 +00:00
cosmohsieh
976995fa36 [Passpointv2] Implement DataUsage header for Wi-Fi detail fragment
Change header to a data usage chart of the specified Wi-Fi network.

Bug: 124700353
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings
Change-Id: Ide08ffd5e97ced5fe54707562690155414598dac
2019-03-14 16:41:08 +08:00
Fan Zhang
6120d57cbc Reduce scope for some methods in SliceFeatureProvider
Bug: 123937830
Test: rebuild
Change-Id: I62db60e8313fc94324b476642fe27a215b76b33d
2019-03-13 15:33:52 -07:00
Fan Zhang
2014d16e46 Fix robotests
Fixes: 128536554
Test: rerun robotests
Change-Id: Ife81f9d161fc416a63a9b2f04ce2ae4f9a1e74db
2019-03-13 14:31:43 -07:00
Fan Zhang
1ef08ae814 Fix robotests
This is related to settings_network_and_internet_v2 flag turn on. Some
tests were assuming old flag behavior.

Fixes: 128356137
Test: robotests
Change-Id: I4eca49f24ad5a10a0fb40f2c02a2d139ba4cb1a4
2019-03-12 16:50:28 -07:00
Salvador Martinez
f087a4cf60 Merge "Remove airplane mode restriction on hotspot" 2019-03-12 18:27:36 +00:00
Hall Liu
843290ccb8 Merge "Add description for Wi-Fi calling mode" 2019-03-12 01:40:43 +00:00