Commit Graph

92 Commits

Author SHA1 Message Date
Martin Stjernholm
c4a0abef8c Revert "Clean up unused WifiManager.ActionListener"
This reverts commit a2adee5362.

Reason for revert: Breaks build - b/294364808

Change-Id: I4f323c2fc43dddbf2f2dd0e323f026727263c99e
2023-08-03 13:46:27 +00:00
Chaohui Wang
a2adee5362 Clean up unused WifiManager.ActionListener
Bug: 285231003
Test: m Settings
Change-Id: I84ec6a76e486df207140c0f5cbda1c6727fe4989
2023-08-02 15:08:04 +08:00
Quang Luong
f4b54b3d49 Fix connected wifi entry not clearing when Wifi is disabled
Connected wifi entry is represented by either
mConnectedWifiEntryPreferenceCategory or
mFirstWifiEntryPreferenceCategory, but we only clear
mConnectedWifiEntryPreferenceCategory when Wifi is disabled. Make sure
to also clear mFirstWifiEntryPreferenceCategory.

Bug: 267815756
Test: manually verify connected wifi is hidden when wifi is disabled
Change-Id: I4c30a658200f1ab90af5ce41a6531f5784a8de5d
2023-02-03 23:54:25 +00:00
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
Weng Su
728a59199b Keep "Resetting your internet" when screen rotates
- The fragment of Internet Settings will be destroyed and recreated when screen rotates

- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed

- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary

Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:50:06 +00:00
Weng Su
79c1439361 Remove Fix connectivity menu for guest
- Don't add the Fix connectivity menu if the user is a guest.

Bug: 252995826
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I42fbd4b931dfaaf42b9319d1085848405db9e1be
2022-11-04 22:54:13 +08:00
Weng Su
1207974dc6 Merge "Remove Modify popup menu for non-admin" into tm-qpr-dev am: 7a8a9e4fba am: fcd8eefe8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288324

Change-Id: Ia487fc1634e0e1ceb3db2a6db5f8a59bf35dbcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 04:54:35 +00:00
Weng Su
dcfbccbfbc Remove Modify popup menu for non-admin
- Don't add the Modify ContextMenu if the user is not an admin.

Bug: 237672190
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I62e0f5559fa2315450221fcb71e348af59af9549
2022-10-26 16:31:00 +08:00
Bonian Chen
2f07595eb0 [Settings] configuration for hidding SIM provider UI
Hide SIM provider UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Change-Id: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
2022-10-20 11:35:28 +00:00
Weng Su
6629b12a08 Restrict Wi-Fi configuration if settings UI is restricted
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: Id82498f41765f955e01bb311bb221d26f9574f31
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
(cherry picked from commit aaa65fc6f0)
2022-09-27 14:31:09 +00:00
Weng Su
aaa65fc6f0 Restrict Wi-Fi configuration if settings UI is restricted
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
2022-09-26 03:35:12 +08:00
Chaohui Wang
b7cb887f8e Fix Change link is not clickable in Internet
Links are not allowed in footer preference title now.

So splitting the string in to title text and change text to fix.

Fix: 232481379
Test: manual test
Change-Id: I857b33ac06ec2fb9619da94a2947dbc25f5b28db
2022-05-13 13:22:23 +08:00
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
2022-05-04 04:01:47 +08:00
Weng Su
876f691377 Restrict secondary users to share Wi-Fi network
- Remove "Share" and "Forget" options from the long press menu

- Rollback the Wi-Fi details restriction for admin user only

- Add SafetyNet Logging for security report

Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkProviderSettingsTest
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest

Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-25 13:49:43 +00:00
Weng Su
190d871520 Restrict WiFi network connection
- Use StandardWifiEntry#canConnect() to determine if the network should
  be disabled or not.

- Use StandardWifiEntry#getSummary() to retrieve the restriction message.

- Disabled WiFi network if it cannot connect.

- If WiFi network is connected or saved network, leave it enabled to
disconnect or configure.

- See the result screenshot in b/203168943#comment11

Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=LongPressWifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
Change-Id: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
(cherry picked from commit f86bdc9c69)
2022-03-08 07:06:30 +00:00
Treehugger Robot
61e1a07529 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955 am: b21993b793
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I4fe5dfdfc66aaad72a31de1761c28c6245db5bd6
2022-01-11 10:51:15 +00:00
Treehugger Robot
b21993b793 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I21f0e516ec82f875638eabcd700fdead02048d7c
2022-01-11 10:03:53 +00:00
Treehugger Robot
0ccb8750b9 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" 2022-01-11 09:06:50 +00:00
Junyu Lai
123f2e1581 [MS50] Remove NetworkTemplate#buildTemplate* usages
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.

Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
2022-01-11 02:53:03 +00:00
changbetty
c13303c585 Add Enterprise restriction check for Wi-Fi QR code sharing
- In the Internet Picker, if a user tries to long press on the SSIDs
   that cannot be shared, the “Share” option should disappear.

Bug: 203169712
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Iea5a25ba80f29be59c39988bba0dcc4689585461
2022-01-06 07:56:40 +00:00
Weng Su
0219dc1378 Fix WiFi toggle issue of Internet Settings
- Because b/209906859 needs to add WiFi service check for WiFi-less
pixel project.

- But mWifiManager has not been initialized before the
addWifiSwitchPreferenceController() function, which will cause the
controller to not handle the WiFi switching UI.

- Add a hasWifiManager() function to initialize the WiFi manager and
handle related functions.

Bug: 212211915
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Idc0d4cdc31403f0ab9a4eb787e4c70be605f7ddb
2021-12-28 21:29:45 +08:00
Tomasz Wasilczyk
00e29015f9 Don't crash Network settings if Wi-Fi is not supported.
Bug: 209906859
Test: flash & boot wifi-less device
Change-Id: If212e7a667e60812c14ece9ef4386de0efb606c2
2021-12-22 10:00:44 -08:00
Linus Tufvesson
553ca3e58d Make WifiDppEnrolleeActivity launches explicit
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible

Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
(cherry picked from commit 59c0a7bc63)
2021-12-20 15:21:25 +00:00
changbetty
76fc500d9b Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
(cherry picked from commit aab7b55926)
Merged-In:I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-11-24 23:23:45 +00:00
Zoey Chen
54c11f53cc Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d am: ca02377238
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: Id27a7fed84ef5e33edddc4e951b77d7705d8e9be
2021-11-18 20:27:46 +00:00
Zoey Chen
e714654c94 [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
2021-11-17 13:09:48 +00:00
Jason Chiu
a9c97f4b60 Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev am: 822f98c1a4 am: 24a738d79f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241518

Change-Id: Idbd2b242fa92a2f3c180066adb1d4f4ffade74d6
2021-11-12 03:26:41 +00:00
Jason Chiu
822f98c1a4 Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev 2021-11-12 03:00:40 +00:00
Jason Chiu
5b7230d355 Check the page searchability for both wifi and network provider page
Fix: 205976868
Test: manual, robotest build pass
Change-Id: Ic056852cb2524a6724dcf4a67b535fd927478338
2021-11-12 03:00:17 +00:00
TreeHugger Robot
8f8e00a7b7 Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev am: 47b212c85b am: e26cf14609
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220934

Change-Id: If309ebe2595d2a138ca45f8f4921144b83a00be4
2021-11-11 19:11:10 +00:00
Weng Su
0d8a53fa0c [Provider Model] Fixed Internet Settings always showing "Loading"
- The Internet Settings will restart itself if it's launching in lock
screen

- The "Loading" might not be hidden if the activity restarts itself

- Move the postDelayed runnable from onViewCreated() to onStart() to
avoid loss

Bug: 204041345
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I516f1105c74b6c8853a72e71c20d2197495cc0d6
2021-11-09 13:22:19 +00:00
TreeHugger Robot
663e79cd94 Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b am: 7272c9d036
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944

Change-Id: Ic8f685b0fb1ba4c1c2d2570b4a2a52288d087d95
2021-10-28 01:08:28 +00:00
TreeHugger Robot
929e577e1b Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev 2021-10-28 00:35:01 +00:00
TreeHugger Robot
0e97ec6ac8 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b am: babbff7b82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I5186454ec25051276f1b0583b7d203314143f59d
2021-10-27 19:52:38 +00:00
Weng Su
3b99a81e78 Move android.settings.WIFI_SETTINGS action to Internet Settings
- Starting from S, the WiFi Settings is changed to Internet Settings

- Redirect to WiFi Settings if Provider Model disabled

- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted

Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
2021-10-26 03:39:13 +00:00
changbetty
aab7b55926 Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
changbetty
435c3385f6 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
(cherry picked from commit bfd3020038)
2021-10-15 21:33:24 +00:00
TreeHugger Robot
a59d04fc76 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b am: ea805db192
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I344b090fe19a804c2212022038c7084dc5b8789d
2021-10-15 20:47:06 +00:00
changbetty
bfd3020038 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
2021-10-15 11:18:07 +00:00
Betty Chang
6a3b697141 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev 2021-08-26 01:50:56 +00:00
Zoey Chen
2a87acf247 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev 2021-08-25 06:04:30 +00:00
changbetty
b1b2da9aca Change the Network preference summary for wifi option
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-08-25 02:55:38 +00:00
Weng Su
fb29dc8a51 Fix Settings crash issue
- Add conditional checks to avoid UI updates when the fragment is
finishing or destoryed.

- Add conditional checks to avoid UI updates if the fragment resource is
not ready.

Bug: 185756174
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I506ee81985158b8992529440a31d2d5cfe81f441
Merged-In: I506ee81985158b8992529440a31d2d5cfe81f441
(cherry picked from commit 1caaf7447d)
2021-08-18 07:46:39 +00:00
Weng Su
1fe8220afa Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-17 08:14:55 +00:00
Weng Su
1caaf7447d Fix Settings crash issue
- Add conditional checks to avoid UI updates when the fragment is
finishing or destoryed.

- Add conditional checks to avoid UI updates if the fragment resource is
not ready.

Bug: 185756174
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I506ee81985158b8992529440a31d2d5cfe81f441
2021-07-29 13:40:17 +08:00
Betty Chang
1465b649df Merge "Change the Network preference summary for wifi option" 2021-07-22 04:02:27 +00:00
changbetty
1d37fc6daf Change the Network preference summary for wifi option
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-07-22 03:25:21 +00:00
Weng Su
e8a4e13a80 Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-07-19 09:29:33 +00:00
TreeHugger Robot
c540823948 Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: c80050cede
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I94a8a696d50d1c052361c501b33e13a47832cf89
2021-07-15 09:27:59 +00:00
Weng Su
5a916eaaf9 Fix the NPE issue in the Internet Settings
- Missing to remove the mRemoveLoadingRunnable in the onStop() function, which will cause the callback to run after the fragment is destroyed and encounter this NPE issue.

Bug: 193405782
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I48b85173db1e6689dd056ba71f2fac776ffabbc9
2021-07-14 14:27:39 +00:00