Commit Graph

2324 Commits

Author SHA1 Message Date
Arc Wang
27d09aeb0c Merge "Fix Wi-Fi QR code decode fail" into qt-dev 2019-05-24 01:56:42 +00:00
tmfang
cb2f916eac Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e
am: 9b9359547c

Change-Id: Iea192e4d92c2c3e7c903dd99f2b06a8258d3af50
2019-05-23 08:05:21 -07: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
Arc Wang
8e3c49123d [Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library
1. Use GlifLayout in all fragments
2. Fragments use 32dp icon instead of 48 dp
3. Replace ScrollView & ProgressBar & Header & Footer of original layout with GlifLayout design
4. Remove ActionBar (no more back button on screen top)

Bug: 129021867
Test: manual
Change-Id: I2fda48cb7f7819b2c8dd85c10d39e1f187463bd8
2019-05-21 13:59:39 +08:00
Fan Zhang
9842725a23 Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129
am: b8ac55aec0

Change-Id: I1594f80c15fd663c706164384c463633eedea264
2019-05-17 21:57:36 -07:00
Fan Zhang
b8ac55aec0 Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: bc58c1f129

Change-Id: I324f3e67e41646fd673afdacc7ee9e59ec5772ae
2019-05-17 17:11:18 -07: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
714163a258 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp
am: 341544f133

Change-Id: I20b2cfca7de66c653ba06aec7c51ba8f40ed22de
2019-05-14 17:38:49 -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
Hai Shalom
094aecb2a1 Merge "[OWE] Support OWE in transition mode" into qt-dev am: ae6f6ab00a
am: 6f80f0db2a

Change-Id: I9c3c44770475806609b6c95fae46a1f9bbef671b
2019-05-14 07:27:47 -07:00
TreeHugger Robot
ae6f6ab00a Merge "[OWE] Support OWE in transition mode" into qt-dev 2019-05-14 13:57:05 +00:00
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
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
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