Commit Graph

1958 Commits

Author SHA1 Message Date
Jason Chiu
1568c82bc9 Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev am: 8bc21da216
am: 28d513fc32

Change-Id: I58d2b2a50eda5155bb70810325897a46c916e14a
2019-05-13 22:17:11 -07: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
Jason Chiu
4af092ac88 Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev am: 6a3eb31763
am: 90cb5628bb

Change-Id: I80d9d96d1be2fa871d1320e29f3c3cb380676d42
2019-05-13 12:34:36 -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
Arc Wang
472a9da81d Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev am: 26ff84d3f4
am: bdd68115dd

Change-Id: I5d89bac92fe0ddba7184b589236dfcfb59b9b6f9
2019-05-13 00:35:59 -07: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
Hai Shalom
c48a02ed8f Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev am: b2fcb7825e
am: 44926a0160

Change-Id: I06df5837db7b69712a98447742dc08f4d02532b2
2019-05-11 20:14:02 -07: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
a8bd70f7a9 Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev am: 41656de5d4
am: 3ce4382031

Change-Id: Idd3be7b3e359a0e71bab0afd6ea016dae38f6f17
2019-05-10 07:13:08 -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
2723563a19 Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev am: 5c461a2859
am: 6830a691dd

Change-Id: I3c74212e9efa6227f5c591080f3b593fb7e42b5a
2019-05-08 20:32:32 -07: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é
d284430132 Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev am: db6a70272e
am: c94db6ca56

Change-Id: Ic3c4ce74c5c0116ec6668aad98818162fce5023c
2019-05-07 07:31:29 -07: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
Jason Chiu
1dafe9864e Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev am: a892ed5cdd
am: 3b1bdd5726

Change-Id: I1443fadd11ce48628466e4c9e4918204800d0c84
2019-05-06 20:44:44 -07: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
24b41f52d3 Merge "Fix themed settings icons." into qt-dev am: 1c3d7aa1f9
am: 4f0d017808

Change-Id: I0d52c9cce9724e64621f919215402639f2323a9e
2019-05-03 23:22:01 -07: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
cosmohsieh
0bf3cc1f3a Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev am: 4653879a22
am: 4f2a59802f

Change-Id: I5fb1ca7ae3e9927ad103c2e7793abb8ee7b74836
2019-05-01 16:23:23 -07: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
Pasty Chang
8b6857951c Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5
am: 9f8406d876

Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
2019-04-30 13:34:49 -07:00
Clown SHEN
9d38cce756 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev am: fbcf3708a6
am: dba84b1781

Change-Id: I31cf1082ff2b1fb370aa6b398760edf338fcd94a
2019-04-30 08:13:53 -07: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
Clown SHEN
5ea8dd1386 Merge "Fix NPE when connect timeout" into qt-dev am: 05e680d3c8
am: 2cd35901f6

Change-Id: If076ec0c2a30e146118bf89fa67092a8280d9143
2019-04-25 00:35:24 -07: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
Arc Wang
9680a5892b Merge "Add action metrics for Wi-Fi provision features" into qt-dev am: 79f75e483f
am: a23f01673b

Change-Id: I4c22fc284b5ae87dd04cfe5052a400421657f22c
2019-04-23 14:49:05 -07:00
TreeHugger Robot
79f75e483f Merge "Add action metrics for Wi-Fi provision features" into qt-dev 2019-04-23 17:36:54 +00:00
Jason Chiu
a8feaee8e0 Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev am: 805e208f14
am: 86d8a9ce8d

Change-Id: I449770b897407afae739ae5e9e852a694512f70f
2019-04-23 09:30:01 -07: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
Jason Chiu
a73d7715d1 Automatically direct the user to the captive portal in Wi-Fi Slice
Save the SSID when the user clicks the network, and then automatically
start login page when the network gets the captive portal capability.

Fixes: 128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ia25241a8243d7d6aae604f341b512350404d9fd1
2019-04-23 12:07:20 +08:00
Clown SHEN
50234a6d6f Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev am: 2e340d284e
am: e0dbee7894

Change-Id: I0f499ed7e65cc4cc1b8736694577493c5e535caf
2019-04-22 20:35:56 -07:00
Clown SHEN
2e340d284e Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev 2019-04-23 03:01:48 +00:00
cosmohsieh
46bf431734 Merge "Improve some comments of strings and codes" into qt-dev am: 0bc3fac6d9
am: b7fc587b5b

Change-Id: Ie78c6030466f81b4526cf2e26986bae816d811ea
2019-04-22 18:29:44 -07:00
TreeHugger Robot
0bc3fac6d9 Merge "Improve some comments of strings and codes" into qt-dev 2019-04-23 00:04:56 +00:00
clownshen
60013de198 Correct detail page UI once user change MAC randomized setting
Changing MAC randomized setting will disconnect and reconnect Wi-Fi in
the background automatically. UI display as disconnect even AP
reconnected. Fix this problem and also remove some obsolete code.
Another problem is connect button display as disabled with
"Connecting..." wording after user click connect then change the MAC
randomized setting.

Bug: 130370187
Test: Manual test with test case in go/wifi_connnection_btn_design
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: Id87c3db0cc785a9ceb3a71c7cbb78ffd87ffb0a1
2019-04-22 11:44:37 +08:00
cosmohsieh
a79783ca2a Improve some comments of strings and codes
1) Correct improper function comment about forget menu
2) Extends char limit of wifi_scan_always_turn_on_message_unknown for
translation.
3) Correct string comment on Saved networks summary

Bug: 130628569
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I0e60e4f205c794367dfffc032cb4334dac4d1cdd
2019-04-21 15:35:58 +08:00
TreeHugger Robot
fbaae11bd7 Merge "Remove deprecated AccessPoint#getConfigName() in SavedNetworkComparator" 2019-04-20 22:09:41 +00:00
Mark Chien
77b7618138 Merge "Ignore the outdated entitlement check" into qt-dev 2019-04-20 04:41:52 +00:00
Mark Chien
f886be6999 Merge "Ignore the outdated entitlement check" am: d7885ca73a
am: 7b30503dc4

Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
2019-04-19 21:07:49 -07:00