Commit Graph

2911 Commits

Author SHA1 Message Date
Weng Su
688fa772b9 Modify Wi-Fi network details settings to restricted style
- Show restricted text in guest mode

- Screenshot:
  https://screenshot.googleplex.com/Q5tbzn67EJigpVJ

Bug: 177573895
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I64c8d82518d47c7f96802f505efa380c63b9e10c
2021-04-09 23:10:24 +08:00
lesl
80af71b92c wifi settings: Fix incorrect maximum compativibility toggle behavior
Correct behavior:

maximize_compatibility (enabled) 2.4 GHz Single AP
maximize_compatibility (disabled) 5 GHz Preferred Single AP

Bug: 184802466
Bug: 184802508
Test: Manual Test to check toggle behavior
Test: RunSettingsRoboTests
Test: atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: I0e97455ea9cf62294b50514ce912ef66d274db8d
2021-04-09 07:29:59 +08:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3)
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
2021-04-07 10:19:10 +00:00
Weng Su
4981dc6ea1 Maximize compatibility string update
- Single AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Reduces hotspot connection speed.

- Dual AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Increases battery usage.

- Screenshot:
  https://screenshot.googleplex.com/84sFvsDegjvJfWT

Bug: 184595717
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: Idca20d4cf5b174110f800fbed91c404d13994b94
2021-04-07 02:27:00 +08:00
Bonian Chen
5735be835c Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
2021-03-31 15:44:41 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)"
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
2021-03-31 09:37:03 +00:00
Yu-Han Yang
8d07eeb590 Merge "Update links to Scanning Settings" into sc-dev 2021-03-30 16:47:18 +00:00
Weng Su
9b86942fec Merge "Fix the WifiTether test case failed" into sc-dev 2021-03-30 11:34:13 +00:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00:00
Weng Su
b63e672fa8 Fix the WifiTether test case failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 184018452
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTether

Change-Id: I64741818d3455154866097f83e3a96c1c510e23b
2021-03-30 17:13:58 +08:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Weng Su
439cc64b1c [Provider Model] Move the Internet unavailable Wi-Fi down
- Check the Wifi network have both INTERNET and VALIDATED capabilities
to achieve effective network access

- Move the Internet unavailable Wi-Fi down to the top of Wi-Fi list

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/w82kbALssdTZmg4

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test on device
atest -c InternetUpdaterTest \
         NetworkProviderWorkerTest \
         ProviderModelSliceTest

Change-Id: Idf04e556ab5a87abc5bc96d1934f5e8fd91fbfaa
2021-03-26 23:24:14 +08:00
Betty Chang
62ba6db719 Merge "Display WiFi Version number" into sc-dev 2021-03-25 15:04:58 +00:00
changbetty
8fcb1f5974 Display WiFi Version number
- Display these type and hide the item in other case
   WIFI_STANDARD_11AX(6) WiFi 6
   WIFI_STANDARD_11AC(5) WiFi 5
   WIFI_STANDARD_11N (4) WiFi 4

-Screenshot
 https://photos.app.goo.gl/BbyZEQFyganEPfuw8

Bug: 117216087
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: Ic360e501d2e3bd80ce3bcb3ddf529ec5d00c1bcc
2021-03-25 17:29:31 +08:00
Yu-Han Yang
109d9bb21d Update links to Scanning Settings
Bug: 180533061
Test: on device
Change-Id: I103dbb999b408614c065763ec6c84952af18ddb3
2021-03-24 19:53:14 -07:00
Weng Su
f50e9c24c1 Correct the defined value of Maximize compatibility
- The return value defined by the Wi-Fi framework API is opposite to the
UI
  Compatibility on:  isBridgedModeOpportunisticShutdownEnabled() = false
  Compatibility off: isBridgedModeOpportunisticShutdownEnabled() = true

- Need to use the reverse value from Settings UI to the Wi-Fi framework API.

Bug: 183576049
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: I731156806661bfbca14e7eaaa648a205a3d77b74
2021-03-24 21:56:57 +08:00
Weng Su
0b34d62f6b Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393

Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
2021-03-24 05:25:04 +00:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
Weng Su
bec3144c11 [Provider Model] Bring back the "turn on Wi-Fi automatically" option
- Screenshot:
  https://screenshot.googleplex.com/92uXX6KQCqWxvub

Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
2021-03-22 22:28:55 +08:00
Weng Su
020af77825 Hide edit menu if network is uneditable
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Merged-In: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
(cherry picked from commit b7dbd3a911)
2021-03-22 09:43:57 +00:00
Bonian Chen
f9f2fe3f84 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
2021-03-22 09:36:16 +00:00
Bonian Chen
db6c47756d [Settings] Convert to getSystemService(Class<T>)
Change to getSystemService(Class<T>) to align the capability with framework
part.

Bug: 179640862
Test: local
Change-Id: I1b4812044fc4876bec6645570049a60f9470dbbd
2021-03-22 06:20:19 +00:00
TreeHugger Robot
8bdbdf4b91 Merge "Hide edit menu if network is uneditable" into sc-dev 2021-03-22 01:53:59 +00:00
Chiachang Wang
a1abb8158d Merge "Replace the way to get the network for no internet dialog" am: f26f579c8d am: 33855bfd7e am: b2da781ff9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644547

Change-Id: I1a89caad4178c56e3bc45e7aa1ed5bb3ad79ce78
2021-03-19 09:43:49 +00:00
Chiachang Wang
6c7f70908e Merge "Remove hidden connectivity methods access" am: 3e737c11db am: 0080dfa65d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644546

Change-Id: I5add5b1a97885b42c324a4e9498abc5196d72557
2021-03-19 09:03:03 +00:00
Chiachang Wang
b2da781ff9 Merge "Replace the way to get the network for no internet dialog" am: f26f579c8d am: 33855bfd7e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644547

Change-Id: I44ab529b8251c1f4630186c74ba2d16b5030e104
2021-03-19 09:02:20 +00:00
Chiachang Wang
3e737c11db Merge "Remove hidden connectivity methods access" 2021-03-19 08:13:06 +00:00
Chiachang Wang
f517a120d0 Merge "Remove hidden connectivity methods access" into sc-dev 2021-03-19 07:20:07 +00:00
Chiachang Wang
003e27d146 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 14:31:28 +00:00
Chiachang Wang
eedfa1d307 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Merged-In: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 22:25:05 +08:00
Chiachang Wang
11c37350d9 Replace the way to get the network for no internet dialog
It's a refactor work for incoming connectivity mainline. The
network information contained in the no ineternet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Update the corresponding logic in Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiNoInternetDialogTest
Change-Id: I75c04d6f1c2159ae990f6015551eb39d99266336
2021-03-18 11:35:05 +00:00
Weng Su
b7dbd3a911 Hide edit menu if network is uneditable
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
2021-03-18 17:35:25 +08:00
TreeHugger Robot
cb64ea60c2 Merge "Smart Router settings UI changes" into sc-dev 2021-03-18 06:43:16 +00:00
Chiachang Wang
75014e693d Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 am: 168298f426
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: Ie8f4aad4c3d89e5b06800d61719478d6b4b7afdd
2021-03-18 04:34:00 +00:00
Chiachang Wang
168298f426 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
2021-03-18 03:41:16 +00:00
Chiachang Wang
77dc754137 Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: I904f5ec889d40113bf232f7935a98c6da030c9c3
2021-03-18 01:43:58 +00:00
Chiachang Wang
f60f9ec14c Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480
2021-03-18 01:18:45 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
Chiachang Wang
eb16ebd14a Replace the hidden ProxyInfo methods usage
The hidden ProxyInfo methods usage should be replaced because
ProxyInfo is moving to connectivity mainline module. Setting
will not be able to access it. Replace the usage with
corresponding APIs.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigController2Test
Test: manually update proxy from setting and check the result
Change-Id: I59192d0d5d38c833eb83cc930e358a738ebe3d13
2021-03-17 12:47:22 +00:00
Chiachang Wang
b16da1a9ca Replace the way to access StaticIpConfiguration
StaticIpConfiguration is a part of incoming connectivity
mainline module. The hidden variable is not accessible for
module outside. The caller should use getter and builder
to access it. Replace the usage with the formal way.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiConfigController2Test
Change-Id: I2ccd427ba19a4ec7df863c38ee0b34cf0be87fa5
2021-03-17 11:30:11 +00:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
2021-03-16 14:45:42 +00:00
Weng Su
68b0057f66 Smart Router settings UI changes
- Remove "AP band" preference

- Add "Maximize Compatibility" switch preference
  - Use bridged mode API for new devices (after P21)

- Screenshot:
  https://screenshot.googleplex.com/84X9Av8gVj3idjB

Bug: 168052744
Test: manual test
atest WifiTetherMaximizeCompatibilityPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ib74156c0fa6eccdd13239854047b1fb4e49a293c
2021-03-16 21:50:55 +08:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Treehugger Robot
e0c081b02e Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 am: c38b502c4a am: f21b7ac120
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I422c40567fc90176cea5242494028d621c1656a5
2021-03-15 12:54:33 +00:00
Treehugger Robot
f21b7ac120 Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 am: c38b502c4a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Betty Chang
ebea5200cb Add OWNER to network/datausage/wifi path
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
Zoey Chen
b8a639f8fd [Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
2021-03-12 19:27:05 +08:00
TreeHugger Robot
3dacd0209c Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev 2021-03-09 08:03:05 +00:00