Commit Graph

2417 Commits

Author SHA1 Message Date
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
Mark Chien
d7885ca73a Merge "Ignore the outdated entitlement check" 2019-04-20 02:05:33 +00:00
Arc Wang
3940c331df Add action metrics for Wi-Fi provision features
// ACTION: Share a Wi-Fi network by generating a QR code
  ACTION_SETTINGS_SHARE_WIFI_QR_CODE

  // ACTION: Connect to a Wi-Fi network by scanning a QR code
  ACTION_SETTINGS_ENROLL_WIFI_QR_CODE

  // ACTION: Share Wi-Fi hotspot by generating a QR code
  ACTION_SETTINGS_SHARE_WIFI_HOTSPOT_QR_CODE

Bug: 130521826
Test: manual
Change-Id: I4204307dd5318eb7c47e4136dc7d8700d43e4da1
2019-04-19 15:28:29 +08:00
TreeHugger Robot
6e115e4fda Merge "[Network Connection] Show full SSID on list item" into qt-dev 2019-04-18 16:51:37 +00:00
markchien
8667e01cf5 Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.

Bug: 129751453
Test: -build, flash, boot
      -atest TetherServiceTest
      -manual test with carrier SIM

Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
Merged-In: Id3157df1a5758f8c72acbc45c9fefd2215c87395
2019-04-18 13:53:40 +00:00
Arc Wang
f83b91ba32 Remove deprecated AccessPoint#getConfigName() in SavedNetworkComparator
Replace it with AccessPoint#getTitle()

Bug: 129740481
Test: manual
Change-Id: I92a500cb86c37f84217ac4fae75e44d79d0d22f9
2019-04-18 11:38:33 +08:00
TreeHugger Robot
bb00e4c028 Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev 2019-04-18 00:58:22 +00:00
TreeHugger Robot
f590d5c617 Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev 2019-04-18 00:33:41 +00:00
Quang Luong
7af19fcb86 Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev 2019-04-17 17:57:39 +00:00
cosmohsieh
e6e4b4d78d [PasspointV2] Set summary of saved networks preference
Summary text of "saved networks" preference has number of both normal
networks and subscriptions

Bug: 130259573
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I8bdf41c1a85165298a2ccd9e688c30b0bd593bfa
2019-04-17 18:21:09 +08:00
cosmohsieh
4025c74f97 [Network Connection] Show full SSID on list item
Long SSID will be cut off, because ellipsized. Show full SSID to gain
better UX.

Bug: 130198869
Test: manual
Change-Id: I14376ff7fb922439a2d664433a94740cc06cd99a
(cherry picked from commit 151d5a3c83)
2019-04-17 06:20:00 +00:00
Arc Wang
0e248383c1 Merge "Hide 'Share' button and 'Add device' preference for a Passpoint Wi-Fi network" into qt-dev am: a713243db4
am: 0045e34d84

Change-Id: Ifa57e4fcd04897444a191098b82cf72a6722daf4
2019-04-16 22:27:34 -07:00
Arc Wang
a713243db4 Merge "Hide 'Share' button and 'Add device' preference for a Passpoint Wi-Fi network" into qt-dev 2019-04-17 01:07:12 +00:00
Quang Luong
0af9b83644 Fixed Passpoint network "Not in range" issue and forget button
Passpoint networks now correctly allow the user to connect and forget
from the saved networks network detail page.

Bug: 130373102
Test: atest WifiDetailPreferenceControllerTest

Change-Id: I6ed2817bb3a1ac657695272ceb9d5e3f3e944f16
2019-04-16 12:52:25 -07:00
Arc Wang
994929ecc7 Hide 'Share' button and 'Add device' preference for a Passpoint Wi-Fi network
Passpoint provisioning is much different from other Wi-Fi networks and ZXing
does not support a QR code format to share a passpoint Wi-Fi network. We
should not show any button to share a passpoint Wi-Fi network.

Bug: 130609037
Test: manual
Change-Id: Ie2538ed9e030e5aa2e88452b50b6592223ca46a8
2019-04-16 16:51:04 +08:00
TreeHugger Robot
164bad59e5 Merge "[Network Connection] Show full SSID on list item" 2019-04-16 07:48:02 +00:00
cosmohsieh
faede7ceb9 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
(cherry picked from commit 9f8522565a)
2019-04-16 07:35:36 +00:00
Pasty Chang
88569d3469 Merge "Set WifiDialog to light theme in setup flow" into qt-dev am: 997128ee91
am: 686fe46e78

Change-Id: If4070e54092b8e122f937676af39d8dc4dcf4aa6
2019-04-15 22:36:41 -07:00
cosmohsieh
151d5a3c83 [Network Connection] Show full SSID on list item
Long SSID will be cut off, because ellipsized. Show full SSID to gain
better UX.

Bug: 130198869
Test: manual
Change-Id: I14376ff7fb922439a2d664433a94740cc06cd99a
2019-04-16 11:38:25 +08:00
markchien
f9f0d11782 Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.

Bug: 129751453
Test: -build, flash, boot
      -atest TetherServiceTest
      -manual test with carrier SIM

Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
2019-04-15 15:54:52 +08:00
pastychang
1d2b51aeb0 Set WifiDialog to light theme in setup flow
Screenshot: https://screenshot.googleplex.com/X6tkxihEWFY

Test: Manual
Bug: 130507879
Change-Id: Icca6b827cdb62387fde4c91435d4df10e2ff4d04
2019-04-15 05:49:51 +00:00
Cosmo Hsieh
c7ae0a3d11 Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev am: 96b534951c
am: bd8c87097d

Change-Id: I5a17e96800fee3f10b1b5a30a7ff3cd8131036af
2019-04-13 23:01:55 -07:00
Cosmo Hsieh
96b534951c Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev 2019-04-14 05:51:02 +00:00
cosmohsieh
ad92bf67e4 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev am: ab3fed9b69
am: 1a5bd24d58

Change-Id: I8f9bd81444f663470b1f7514d51d75d90a1038d6
2019-04-12 17:31:13 -07:00
TreeHugger Robot
ab3fed9b69 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev 2019-04-12 21:27:37 +00:00
cosmohsieh
b0aee6abd0 Fix null App name in Wi-Fi scanning prompt dialog
App name of the dialog msg is null because getCallingPackage() is null
when calling activity does not use startActvitiyForResult().

Bug: 112248584
Test: manual
Change-Id: If5ba9eb62f895c66ac1839b4be5c372ecba6699c
2019-04-12 17:02:22 +00:00
cosmohsieh
6938ad1630 [PasspointV2] Clear feature flag settings_wifi_details_saved_screen
Clear feature flag settings_wifi_details_saved_screen

Bug: b/128369527
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ib8fc9c9eb52bee12d6501a2041c32aa60c80e70e
2019-04-13 00:58:23 +08:00
Arc Wang
3ef032d2a4 Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev am: ff0db2f26b
am: 1785625089

Change-Id: I0fb1ad5aa152d239412b054430a8d593d391d346
2019-04-11 20:28:04 -07:00
Arc Wang
5ec396c14c Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev am: 982e46fe6c
am: 54d5b05d69

Change-Id: I290732e2c88aacdf64d44721cc6133602b492b24
2019-04-11 20:26:06 -07:00
Arc Wang
ff0db2f26b Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev 2019-04-12 02:44:33 +00:00
Arc Wang
982e46fe6c Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev 2019-04-12 02:36:21 +00:00
Brad Ebinger
f618733c83 Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b
am: ac4a495fc2

Change-Id: I37be576b43c13e67b03dca0e1ea7baa490e03614
2019-04-10 23:05:53 -07:00
Brad Ebinger
6acceb3cd1 Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
am: c91d33798b

Bug: 117193148
Test: manual CP
Merged-In: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
(cherry picked from commit ac4a495fc2)
2019-04-11 00:37:37 +00:00
Brad Ebinger
ac4a495fc2 Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
am: c91d33798b

Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
2019-04-10 17:33:20 -07:00
Antony Sargent
5cd5845752 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev am: 3b7cdfb708
am: a6b87a24f2

Change-Id: I204f41ee8c0bbf9159879e9b7014c240a19e6ce7
2019-04-10 17:29:32 -07:00
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