Commit Graph

1591 Commits

Author SHA1 Message Date
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:27:13 +00:00
Fangqiu Su
828f2fcec9 Update uiautomator references in packages/apps/Settings/tests/unit
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
2023-04-24 18:07:07 +00:00
SongFerng Wang
782bb2f069 Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 09:29:21 +00:00
SongFerngWang
88717f2c3f Avoid ANR when UI query network selection state
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
SongFerng Wang
327ae0d6db Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev am: be84e27612
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21328340

Change-Id: I013418971db0db3a3e64895423063a88aac3c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 02:55:44 +00:00
SongFerngWang
e85bb5058d Add a config to hide the 3G option at preferred network mode UI
Add a config config_display_network_mode_3g_option to hide the 3G
option at preferred network mode UI

Bug: 261615630
Test: build pass. local test pass.
atest EnabledNetworkModePreferenceControllerTest

Change-Id: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
(cherry picked from commit f7685dd715)
Merged-In: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
2023-02-08 07:41:13 +00:00
Zoey Chen
245def5cad [Settings] Add the CarrierNetworkChange case am: ba7418ecd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312559

Change-Id: Ie5927ffa717e26bc452c74f5ddb94f84720e9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 13:31:29 +00:00
Zoey Chen
ba7418ecd7 [Settings] Add the CarrierNetworkChange case
Bug: 262927206
Test: atest SubscriptionsPreferenceControllerTest
Change-Id: If7eeb185224179d59ab841af0062ec5b98b956e9
Merged-In: If7eeb185224179d59ab841af0062ec5b98b956e9
2023-02-07 10:48:30 +00:00
Lucas Silva
600741c78c Only show communal settings to the primary user am: e33639f117
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979

Change-Id: Ia66b6011f37412bbbdf783b3d5f844446f4fc1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 17:22:02 +00:00
Lucas Silva
e33639f117 Only show communal settings to the primary user
Fixes: 264284347
Test: flashed device, and verified settings don't appear for secondary
user. Setting still appears for primary user
Test: atest CommunalPreferenceControllerTest

Change-Id: I6686ce4dbc7d708a93131620ae93c5e0dc323995
2023-01-09 15:15:27 +00:00
Becca Hughes
da53b2912c Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:28:41 +00:00
Becca Hughes
71c948ce7b Add credential manager team to OWNERS
Adds Credential Manager team to owners
for where our settings UI lives (see
internal CL).

Change-Id: I0674b170c9b96e7e7dedbb5be63fa3929f292274
Test: presubmit
Bug: 253157366
2023-01-04 17:24:35 +00:00
Darrell Shi
955a2f2ac3 Change screensaver ctrlr to base pref ctrlr. am: 542644e83f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682

Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 08:23:48 +00:00
Darrell Shi
542644e83f Change screensaver ctrlr to base pref ctrlr.
This change makes it that the ScreenSaverPreferenceController extends
BasePreferenceController so that it can be readily used and pointed to
from an xml file.

Bug: 261627295
Test: atest ScreenSaverPreferenceControllerTest

Change-Id: I95487f2f49a23422fff46f30b0cfa287582a547b
2022-12-16 16:49:54 +00:00
Edgar Wang
f39285a722 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287

Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 03:47:35 +00:00
Edgar Wang
49cd8d88d1 Avoid media transcode can be bypass guard of developer options
When developer options switch is off, a user including guest user
can still configure media transcoding settings via slices.

Bug: 244569778
Test: manual
Change-Id: I3d70045c2498e683bf615cbe521e2f98d50b7eec
(cherry picked from commit a94e8d0bc7)
2022-12-01 12:25:31 +00:00
Joshua Mccloskey
88c9b00bac Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595

Change-Id: Ic81bafc8063bba1e65eef7729001556e8a330247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 01:27:36 +00:00
Joshua Mccloskey
1dd3fefa93 Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev 2022-12-01 01:02:40 +00:00
Joshua Mccloskey
a2133c2b00 Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."
This reverts commit 3ca9965a96.

Reason for revert: b/259709482

Change-Id: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
Merged-In: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
2022-11-30 00:31:23 +00:00
TreeHugger Robot
1793a5a322 Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152

Change-Id: I979fff8af4a4da75a0fd0d173a6561032a78895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 00:30:00 +00:00
TreeHugger Robot
dc4b54c168 Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev 2022-11-24 00:01:22 +00:00
Bonian Chen
f01cea0236 Merge "[Settings] Code Refactor" am: 8ae657bd80 am: f6d9536922
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I5b90defe3741e720280fe026ab45f57b013fa640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 10:36:53 +00:00
Bonian Chen
f6d9536922 Merge "[Settings] Code Refactor" am: 8ae657bd80
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 10:11:28 +00:00
Weng Su
d46c3848a9 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

Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:55:22 +00:00
Bonian Chen
c3028291ed [Settings] Code Refactor
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I1fab8d0347f64c01ee768e4bb9ea838a9e7ad4fc
2022-11-19 13:14:07 +00:00
Bonian Chen
81e86e8d5d Merge "[Settings] Code Refactor" am: bafd49d604 am: c31caafb5a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239

Change-Id: I8dbda9c6b40fb8207b81b30e89e464eea87a06bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 12:31:54 +00:00
Bonian Chen
c31caafb5a Merge "[Settings] Code Refactor" am: bafd49d604
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239

Change-Id: Iad870d2df6f9ecb2ff207b8753288da6446e218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 12:06:39 +00:00
Bonian Chen
e1f641a130 [Settings] Code Refactor
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I6710aa814441c0858c712f416ffddde44081d4d1
2022-11-18 08:36:53 +00:00
Adam Bookatz
632754a466 Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629

Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 01:23:04 +00:00
Adam Bookatz
9703f6a154 Merge "Introduce concept of DockUser" into tm-qpr-dev 2022-11-16 00:59:41 +00:00
Hao Dong
f5ffb13dc1 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916

Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:04:49 +00:00
Adam Bookatz
e5e232428d Introduce concept of DockUser
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.

Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
2022-11-14 19:19:21 +00:00
Hao Dong
3ca9965a96 Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.
Change to launch FingerprintEnrollIntroductionInternal directly when no fingerprint enrolled and fingerprint is the only biometrics. This avoids the flicker of FingerPrintSettings before showing the enroll introduction.
This partially reverts the change in ag/19732076.

Bug: 256334588

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest

Change-Id: I057b00fbca6660012887ebedf4d65c2c3d35792b
Merged-In: I057b00fbca6660012887ebedf4d65c2c3d35792b
(cherry picked from commit 6bed01f315)
2022-11-12 23:41:37 +00:00
Bonian Chen
bf55048799 [Settings][Back port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
(cherry picked from commit 2b048b22f0)
2022-11-04 07:06:23 +00:00
Gil Cukierman
58d85e3383 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I5b61fd4c84e9ea881f786355c9649bd744d46ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:02:30 +00:00
Gil Cukierman
27217b87a9 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I17e4dc0b5dfdfd55a866b641af560b4dccba1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 14:21:52 +00:00
Bonian Chen
2b048b22f0 [Settings][Back port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
2022-10-28 09:49:21 +00:00
TreeHugger Robot
dda18d1d8c Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146

Change-Id: I7b3275ffad2af79bb81c3761b691ab793a61168a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-24 03:26:46 +00:00
Weng Su
f9b5e046a8 Add config for Wi-Fi Hotspot Settings hidden
- Add config_show_wifi_hotspot_settings for Settings customization

- Hide Wi-Fi Hotspot preference in Hotspot & tethering Settings

- Don't launch Wi-Fi Hotspot Settings (e.g long press on Hotspot in QS-tile)

Bug: 213426762
Test: manual test
atest -c com.android.settings.wifi.WifiUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Merged-In: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
Change-Id: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
(cherry picked from commit 160b5078ed)
2022-10-20 09:50:22 +00:00
Gil Cukierman
a2ddff3865 Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController
When 2g is disallowed by a device admin the 2g toggle in the preference
screen will implement the following behaviors as a result of being
changed to a RestrictedSwitchPreference:
1. become disabled (greyed out)
2. show a summary message explaining that the preference was disabled by
   an admin
3 show a pop up when a user tries to click on the preference informing
  them that the setting is unusable because it was disabled by an admin.

Additionally, the toggle will show as unchecked (off) when admins
disable 2g.

When 2g is re-enabled by a device admin, the preference screen will go back
to its previous state.

Test: atest Enable2gPreferenceControllerTest
Bug: b/248250240
Change-Id: I7af901f2d9f62ebfe884e01724d8eff845c2968e
2022-10-19 21:01:17 +00:00
SongFerng Wang
bd476febf0 Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277

Change-Id: Ib62e9adf0e2bdac25821c9f70634c27b26515056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 06:50:09 +00:00
SongFerng Wang
2cd07f51ef Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev 2022-10-18 06:30:34 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:46 +00:00
SongFerngWang
c27b674e38 [MEP] the user can't enable the psim when revmovable esim is enabled
The isRemovableSimEnabled method at ToggleSubscriptionDialogActivity
UI is for psim, not esim. It should skip the revmovable esim slot.

Bug: 251384644
Test: build pass. atest UiccSlotUtilTest
Change-Id: I11d0f9528961ec5e47cd8682cf9b6bb988a5700f
2022-10-11 18:48:36 +08:00
Hugh Chen
f891f7ba86 RESTRICT AUTOMERGE Refactoring settings UI
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
2022-10-11 04:30:09 +00:00
Tom Hsu
f0635482c7 Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133

Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev 2022-09-29 15:52:32 +00:00
Tom Hsu
a4c78e3820 Revert "[Languages] Add new information to system language page."
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
2022-09-29 04:38:30 +00:00
Gil Cukierman
02ef8722be Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 17:50:11 +00:00
Gil Cukierman
ccfd44162f Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:54 +00:00