Commit Graph

2324 Commits

Author SHA1 Message Date
Brad Ebinger
d2727d5d9f Merge "Fix issue that user can't edit WFC mode for SIM2" 2019-04-10 21:57:56 +00:00
TreeHugger Robot
3b7cdfb708 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 2019-04-10 20:01:32 +00:00
Clown SHEN
68b1550e9e Merge "Add icon for sign in" into qt-dev am: fa1c69ee44
am: a788391042

Change-Id: I620c7c3a8d4593aab9501528c1e0fe1dac34d274
2019-04-10 02:07:34 -07:00
Arc Wang
2b0c8a0c6b Fix Wi-Fi QR code scanning icon disappears problem
Should not do one time initialization for the View in
Preference#onBindViewHolder. Because A view setup in
PreferenceViewHolder may be recycled.

Bug: 127502788
Test: manual
Change-Id: Iedf023fa00d2745a02521b65e5c12165c2bc025b
2019-04-10 14:20:11 +08:00
Arc Wang
2ef2ed66b6 Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator
For a WEP Wi-Fi network, we should get the password from
WifiConfiguration#wepKeys instead of WifiConfiguration#preSharedKey.

Bug: 130204717
Test: manual
Change-Id: I766a767f3d605c7fbf0b71d263fd111f159c7cde
2019-04-10 13:59:20 +08:00
Clown SHEN
fa1c69ee44 Merge "Add icon for sign in" into qt-dev 2019-04-10 02:48:20 +00:00
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
Arc Wang
a7d67bc2a6 Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev am: d50bb09876
am: ce9e61ee8e

Change-Id: Id0da8742a507462e16f549afeae2b36dd47f0fc3
2019-04-09 04:07:33 -07:00
Arc Wang
787e37b962 Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev am: 48ed84ebf4
am: 01a26124d7

Change-Id: I7dc26c8ebd15fc07c994e97b0eff4d4108f59b75
2019-04-09 03:26:56 -07:00
Arc Wang
fa977e12db Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev am: 73f539d296
am: ee55582d8b

Change-Id: I653420aafabd30107b0f6f05b2cfc44978b2506b
2019-04-09 03:22:37 -07:00
TreeHugger Robot
d50bb09876 Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev 2019-04-09 08:30:33 +00:00
clownshen
9762652115 Add icon for sign in
Bug: 130188624
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I58a6c411a31e5cb0fe05eba486ba38774c078070
2019-04-09 06:56:16 +00:00
Clown SHEN
740dd43700 Merge "Redraw WiFi detail page's header icon" into qt-dev 2019-04-09 06:45:49 +00:00
Arc Wang
e2b4bccbf1 Should not decode Wi-Fi QR code after onPause
Bug: 130141694
Test: manual
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: I412fb7c06220c23bddc7b3c448fcc72a00bdecc3
2019-04-09 13:30:59 +08:00
TreeHugger Robot
99c95a3a77 Merge "Implement context menu for ConnectedAccessPointPreference" 2019-04-09 04:49:50 +00:00
TreeHugger Robot
48ed84ebf4 Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev 2019-04-09 04:18:09 +00:00
Arc Wang
4a5ff58511 Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator
When scanned a no password ZXing QR code, add both open network &
enhanced open network to configured Wi-Fi network list because this kind
of QR code may refer to a open network or an enhanced open network.

Bug: 124131581
Test: manual
Change-Id: Id9f85ef8dcdf72347be8106938437aecd0eed9f5
2019-04-09 10:36:07 +08: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
cosmohsieh
9f8522565a Implement context menu for ConnectedAccessPointPreference
1) User wants to long press ConnectedAccessPointPreference to forget network if this
is a captive portal network.
2) Change context menu string

Bug: 113756562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: If5c45c45fe126f627eeb53a6c1873a070ad23ae8
2019-04-09 10:17:20 +08:00
Arc Wang
63b4c1ab85 Remove the PreferenceGroup without title in WifiNetworkDetailsFragment
To remove the PreferenceGroup title space.

Bug: 129683066
Test: manual
Change-Id: I00bced8038a01c0ef7e8f4dfa0b82e36a275004e
2019-04-08 20:19:11 +08:00
clownshen
86f65ef488 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
2019-04-08 08:50:12 +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
TreeHugger Robot
3c5665f429 Merge "Play vibration when Wi-Fi QR code scanner recognize a valid QR code" 2019-04-03 07:56:21 +00:00
Arc Wang
cb1c9fceb8 Play vibration when Wi-Fi QR code scanner recognize a valid QR code
Bug: 127377350
Test: manual
Change-Id: I9bfcb6f4d1d4dee45d2cacdedfc07d2f4eccd758
2019-04-03 10:27:32 +08:00
Clown SHEN
8cc371e643 Merge "Only show Sign In button for connected network" 2019-04-03 02:16:05 +00:00
Hao Zhang
459180e775 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
Merged-In: I881d479c1e02525ac614c66594637a5e0347d70c
2019-04-02 20:06:20 +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
Clown SHEN
5cfde78ac3 Merge "Enlarge wifi signal icon from 24dp to 32dp for header view" 2019-04-02 03:20:34 +00: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
Clown SHEN
86668e2565 Merge "Update state as disconnected when Wi-Fi disabled" 2019-04-02 03:03:49 +00:00
clownshen
b5ab562c12 Update state as disconnected when Wi-Fi disabled
Connect button display wrong string "Connecting..." and be disabled
when Wi-Fi turned off at quick setting. Update state as disconnected
when Wi-Fi disabled to fix this issue.

Bug: 129514552
Test: manual test
Change-Id: I76a247ce0ed951357172e67221281b004df386d8
2019-04-02 03:02:22 +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
Hall Liu
5697a7e85d Merge "Show the disclaimer regarding WFC location privacy policy" 2019-04-01 22:55:51 +00: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
clownshen
24827d35b1 Enlarge wifi signal icon from 24dp to 32dp for header view
Bug: 129413562
Test: manual test
Change-Id: I50a27ac25e5ae42530736bb7c019485a51d707ba
2019-04-01 07:08:55 +00: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
7370aaa282 Merge "[Network Connection] Correct canceling dialog behavior" 2019-03-29 09:45:22 +00:00
TreeHugger Robot
76ff2b4291 Merge "Hide Wi-Fi QR code scan button for unsupported Wi-Fi networks" 2019-03-29 08:57:29 +00:00
Cosmo Hsieh
e1b6d7d875 Merge "Show "Disconnect" on forget button for ephemeral network" 2019-03-29 03:18:00 +00:00
Arc Wang
dae6c695ca Hide Wi-Fi QR code scan button for unsupported Wi-Fi networks
Wi-Fi QR code scan button only shows for the Wi-Fi network which
supports Wi-Fi Easy Connect or ZXing Wi-Fi config format.

Bug: 128847959
Test: manual
Change-Id: If6460ce88748e7b06893bf62060418a8727d3134
2019-03-29 10:17:44 +08:00
cosmohsieh
03b8cd76ac [Network Connection] Correct canceling dialog behavior
Use setCancelable() rather than setCanceledOnTouchOutside() for better
code smell and consisting with general not canceling behavior.
The back key and touching outside will not cancel this dialog for better
UX.

Bug: 128877712
Test: atest NetworkRequestDialogFragmentTest
Change-Id: I19bc5637a7307610e34db15d54c1d80d5b7e379b
2019-03-29 10:15:21 +08:00