Commit Graph

2419 Commits

Author SHA1 Message Date
Chaohui Wang
dae71fffb4 Dismiss the open dialog if preference is disabled
In EnabledNetworkModePreferenceController, to prevent user changing the
value.

Fix: 304952402
Test: manually - open dialog, then received a call
Change-Id: Ia1be0840b061c796f72bf5053870fa9e90bd215f
2023-10-18 19:50:35 +08:00
Treehugger Robot
415ee62af8 Merge "Validate ringtone URIs before setting" into main 2023-10-18 02:04:10 +00:00
Wu Ahan
daa7f4f3cd Merge "Reland sfps enroll improvement feature with feature provider" into main 2023-10-18 01:48:38 +00:00
Peiyong Lin
34d308924e [Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
Merged-In: I2e63431cd0d8cf4712fc278646627fbf34a2b542
2023-10-17 21:07:48 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI.
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
2023-10-17 21:06:05 +00:00
Treehugger Robot
f17e4138b8 Merge "Add tests for Education" into main 2023-10-17 08:36:01 +00:00
Wu Ahan
667341c343 Reland sfps enroll improvement feature with feature provider
Prior cl, ag/24720067, was reverted due to platinum failed,
this cl fixes the fails (NPE on UDFPS).

Bug: 288155127
Bug: 305132251
Test: Manually check on Lynx and Felix
Test: atest BiometricsE2eTests:FingerprintEnrollSuccessTest
Test: abtd for platinum, see b/305048300#comment14
Change-Id: I90f4ea14853edf03abd8ffe0b7874894eb2d4f81
2023-10-16 15:23:18 +00:00
Peiyong Lin
ccf778a8a0 Merge "Allow ANGLE developer option toggle UI enabled if ANGLE is enabled." into main 2023-10-13 04:57:32 +00:00
Hao Dong
03af4571e3 Add tests for Education
Test: atest FingerprintEnrollFindSensorViewModelV2Test
Bug: 295206773

Change-Id: I741ddf49fccae7a301e2fb79194ce8cc6b966070
2023-10-13 00:51:55 +00:00
Peiyong Lin
8e6af783ce Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
2023-10-13 00:36:36 +00:00
Priyanka Advani
fc3433b454 Merge "Revert "Implement sfps enroll improvement feature with feature provider"" into main 2023-10-12 21:07:27 +00:00
Priyanka Advani
a99bab5b57 Revert "Implement sfps enroll improvement feature with feature provider"
This reverts commit 2ffe187d1b.

Reason for revert: Likely culprit for b/305048300

Change-Id: Ia9d2d98bcb09d63dacde7134c20ded2ed51f9ab4
2023-10-12 19:02:20 +00:00
Graciela Putri
39386158b7 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac am: 94f7219937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: I08c0fcfe2c81b9c36b63165233e844e975bf93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 10:00:30 +00:00
Wu Ahan
8fb032a73f Merge "Implement sfps enroll improvement feature with feature provider" into main 2023-10-12 09:54:51 +00:00
Graciela Putri
94f7219937 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: Iab27c31c7512f4f7e48d8b10d410044c4db39aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:28:31 +00:00
Krzysztof Kosiński
665b151f87 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 23:10:01 +00:00
Krzysztof Kosiński
15e17e0119 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:41:36 +00:00
Krzysztof Kosiński
c81fbcef2e Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:39:33 +00:00
Wu Ahan
2ffe187d1b Implement sfps enroll improvement feature with feature provider
Bug: 288155127
Test: Manually
Test: atest FingerprintEnrollEnrollingTest.java
Change-Id: Idb6e5afab4b9cbf8f2ed26819a55dcb34acb1ab9
2023-10-11 08:37:44 +00:00
Graciela Wissen Putri
e6c4beca80 Remove 4:3 aspect ratio option for foldables
Bug: 304260896
Test: atest UserAspectRatioManagerTest
Change-Id: I8a745c90e45e8776eef082e01dc2155fe6b353b6
2023-10-10 17:18:48 +00:00
Chaohui Wang
b19eb9a4c2 Create AppDataUsageListController
For better organization and testings.

Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I77ceeccc7055fcd948fe40d5dfb9cc4a9b9ad2ee
2023-10-07 15:03:27 +08:00
Valentin Iftime
323fbda20e Validate ringtone URIs before setting
Add checks URIs for content from other users.
 Fail for users that are not profiles of the current user.

Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-06 15:44:17 +02:00
Gil Cukierman
18403f2adc Merge changes from topic "cukie-300248708-hide2gremoval" into main
* changes:
  Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
  Add feature flag for removal of KEY_HIDE_ENABLE_2G
2023-10-04 20:12:53 +00:00
Gil Cukierman
761fd612c4 Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
KEY_HIDE_ENABLE_2G is soft removed in Android API level 35
because it hides a security feature. This patch
introduces simplified logic that ignores the
carrier config value. The new behavior is behind a feature flag.

This patch also includes some cleanup.
1. It removes an unneeded check for null carrier config
2. It removes test logic that set the value of KEY_HIDE_ENABLE_2G
   in places where it had no impact on the test.

Bug: 300248708
Test: atest Enable2gPreferenceControllerTest
Change-Id: I892d115d1ae173d2f3cd69e8f8b97bc5bfa7c67b
2023-10-04 13:59:55 +00:00
Zoey Chen
c2522b8f9d [ToA] Terms of Address UI, fragment in LocaleListPicker
Test: atest TermsOfAddressCategoryControllerTest
Test: adb shell device_config put settings_globalintl com.android.settings.flags.terms_of_address_enabled true
Bug: 295826542
Bug: 297798866
Change-Id: I2b9af7cbe7cab0bb7b2168bc99f0fa7bc0903ac2
2023-10-03 06:36:05 +00:00
Hao Dong
d11b9d1647 Merge "Use shared lib for settings v2." into main 2023-09-30 17:25:52 +00:00
Eghosa Ewansiha-Vlachavas
2c50be71c5 Fix testGetUserMinAspectRatioEntry for both tablets and foldables am: 136bd906da am: 933b2431fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24879571

Change-Id: I1a08e894582e04583bb2f1e26945cae85f1b4fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 21:51:22 +00:00
Eghosa Ewansiha-Vlachavas
933b2431fb Fix testGetUserMinAspectRatioEntry for both tablets and foldables am: 136bd906da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24879571

Change-Id: If37a415cc6f53f1f9df7731129dd9fa42341c4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 20:45:20 +00:00
Hao Dong
ae40494ee6 Use shared lib for settings v2.
Test: settingsv2 tests passed
Bug: 302372183

Change-Id: I6d1b20853b26662c538e804b1191bb720f1d7b8f
2023-09-28 19:16:11 +00:00
Zoey Chen
60d3f7b7d2 Merge "[ToA] Terms of Address UI, fragment and the list: - Feminine, Masculine, Neutral, Not Specified" into main 2023-09-28 17:00:49 +00:00
Eghosa Ewansiha-Vlachavas
136bd906da Fix testGetUserMinAspectRatioEntry for both tablets and foldables
Tabelts and foldables now have different aspect ratio values in their
config, so we need to test the devices separately as we shouldnt test for
values that are not in the config of the device the test is run on.

Fixes: 302155585
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I78fa3020501a4be992bb90fea16a6fec4f37594b
2023-09-28 13:23:11 +00:00
Eghosa Ewansiha-Vlachavas
5f624b70ba Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14 am: 2595f32076
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937

Change-Id: Iaa9687110887498c26d246dfed086eb1f8d529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 12:13:01 +00:00
Eghosa Ewansiha-Vlachavas
2595f32076 Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937

Change-Id: I9ed3cf613ae4b20c1465403be0c989a00be425fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 11:08:02 +00:00
Eghosa Ewansiha-Vlachavas
a3108d5b14 Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev 2023-09-28 10:39:35 +00:00
Zoey Chen
b501ab183e [ToA] Terms of Address UI, fragment and the list:
- Feminine, Masculine, Neutral, Not Specified

Test: atest TermsOfAddressNotSpecifiedControllerTest, atest
TermsOfAddressNeutralControllerTest, atest
TermsOfAddressMasculineControllerTest, atest TermsOfAddressFeminineControllerTest
Bug: 295826542
Bug: 297798866
Change-Id: I490ace0035c809cac47bae460f558f13875ff18f
2023-09-28 02:23:57 +00:00
Eghosa Ewansiha-Vlachavas
6bd9bff2e2 [1/n] Aspect ratio settings app list refinement
All apps list for work profile currently only shows work apps that are
also installed on the normal user. Update filter for list to show all
launcher apps for both users in their respective lists.

Fixes: 301373413
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Test: atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Ia0bf15340d1b37dcd926d81598d3e94f448a46fc
2023-09-27 17:30:23 +00:00
Peiyong Lin
21c967bc96 Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev am: e456cb72f9 am: 759a3fda7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842231

Change-Id: Iec2e7a51a9b0179fceef6182a1bd9cd2668ddab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 21:34:17 +00:00
Peiyong Lin
759a3fda7b Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev am: e456cb72f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842231

Change-Id: Iaae1e5f2747e8e6d62c5426ded572b792642e9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 20:35:23 +00:00
Joshua Mccloskey
6d8b293051 Merge "Moved FakeFingerprintManagerInteractor" into main 2023-09-26 15:04:03 +00:00
Peiyong Lin
774378530f Add debug property to safe guard ANGLE developer option UI.
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
2023-09-25 18:33:00 +00:00
Tom Hsu
f357f32284 Merge "When device has a call, avoid user inactive/active SIM." into main 2023-09-25 06:59:44 +00:00
tom hsu
e7d98dea9d When device has a call, avoid user inactive/active SIM.
Bug: 296314216
Test: atest passed
Change-Id: I1a717d24a87316ccf065a2c02c49dc7e29825905
2023-09-25 13:32:52 +08:00
Chaohui Wang
30b81d637e Clean up Backup Calling
Fix: 289967466
Test: m Settings
Change-Id: Ic487c06383f1dba04b59a54301f083c265717d9b
2023-09-23 22:35:55 +08:00
Joshua McCloskey
1ec202576d Moved FakeFingerprintManagerInteractor
Test: atest
Bug: 295206367
Change-Id: If9f3b9dc88260c0725f70d3444c4f9a4b6ee5c2f
2023-09-22 16:55:25 +00:00
Sudheer Shanka
08710ee575 Merge "Add controls in dev options to quarantine apps." into main 2023-09-21 22:47:30 +00:00
Chaohui Wang
ba1ec910ac New BillingCycleRepository
Migrate BillingCyclePreference to BillingCycleRepository first, will
also migrate DataUsageList in future cl.

Also fix an issue that the BillingCyclePreference initial enable state
not set.

Bug: 290856342
Test: manual - on mobile settings
Test: unit test
Change-Id: Idd171fefbc30763010afb7bfb68543612f7b9b1a
2023-09-21 12:57:51 +08:00
SongFerng Wang
176d358c32 Merge "Remove the cached display name" into udc-qpr-dev am: 26a1866b8d am: c7ea38203a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24793547

Change-Id: If9ddb12284b6e4022c18bd54095eb67b8809d985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 13:17:07 +00:00
SongFerng Wang
c7ea38203a Merge "Remove the cached display name" into udc-qpr-dev am: 26a1866b8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24793547

Change-Id: I0c006b215c02acda9a44e717165249fbbd8f353a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 12:22:25 +00:00
SongFerngWang
d21f14a002 Remove the cached display name
If the display name is changed, then the Settings should remove the
cached display name.

Bug: 296157273
Test: [pass] atest SubscriptionUtilTest  [pass]Build and manual test
Change-Id: I3b1297ddddf9f9051dd16523b97fc27255cf3923
2023-09-19 06:25:33 +00:00
Sudheer Shanka
abbb5c4dc3 Add controls in dev options to quarantine apps.
Bug: 297934650
Test: m -j RunSettingsRoboTests
Test: atest SettingsUnitTests
Change-Id: Ic0f35b370c04dd4ed3baaf3610b46ff1b37a0463
2023-09-18 07:27:37 +00:00