Commit Graph

2894 Commits

Author SHA1 Message Date
Bill Lin
20df11e9ca Merge "Revert "Launch multiple biometric enrollment when no biometric is enrolled"" into main 2025-03-18 05:15:37 -07:00
Bill Lin
cb181c50b5 Revert "Launch multiple biometric enrollment when no biometric is enrolled"
This reverts commit c4ee2b83e5.

Reason for revert: b/404133188

Change-Id: I523ab1cc638ac9782a6b60a7f640f620bb3aae22
2025-03-18 03:28:08 -07:00
Tom Hsu
4829391574 Merge "[Satellite] Remove useless unitest" into main 2025-03-17 09:33:17 -07:00
Treehugger Robot
1bb0fe126f Merge "[Satellite] Refactor code to controller base." into main 2025-03-17 08:34:53 -07:00
tom hsu
9757bd2d5f [Satellite] Remove useless unitest
Flag: EXEMPT bug fix
Bug: b/387596751
Test: atest pass
Change-Id: I26c676b36ebfd6727b69adadb753e3c2697c8780
2025-03-17 14:34:32 +00:00
tom hsu
f0efc2e363 [Satellite] Refactor code to controller base.
- Your mobile plan

Flag: EXEMPT refactor
Bug: b/403149290
Test: atest pass
Change-Id: Ia21f3d8b301401799263a1a2b43d82e9a46729a5
2025-03-17 13:52:58 +00:00
Jacky Wang
91dab36efd Change storage_summary string id to fix crash
ag/32322018 reverts storage_summary string for default locale but other
languages might be still using stale translations and cause
MissingFormatArgumentException crash.

As a quick fix, change the string id to make it as a new string. The
side-effect is that storage summary is not localized for a while.

Fix: 404116634
Flag: EXEMPT bugfix
Test: Verified with zh_TW locale
Change-Id: I5d7d6be2c1eb524622f1013120cb44403b1f6f29
2025-03-17 19:41:57 +08:00
Treehugger Robot
3c6c586407 Merge "[Satellite] Move entitlment check to auto type only." into main 2025-03-16 22:56:23 -07:00
tom hsu
6828692238 Fix test failed due to wrong string.
Flag: EXEMPT bug fix
Fix: b/404076543
Test: atest pass
Change-Id: Id1152aeed25cb2956b54a9071a0a76bc2a938b15
2025-03-17 04:41:06 +00:00
tom hsu
7ca28dd3d6 [Satellite] Move entitlment check to auto type only.
Flag: EXEMPT bug fix
Bug: b/401648126
Test: atest pass
Change-Id: Ide6f8520b5e1e60f700586ef00970a4f55f5babe
2025-03-17 03:52:02 +00:00
Treehugger Robot
accbe2362a Merge "Screen Resolution: add space for 4-digit values" into main 2025-03-14 13:28:57 -07:00
Vadym Omelnytskyi
14050c89f5 Screen Resolution: add space for 4-digit values
Add logic that composes screen resolution string with non-breaking
spaces. Now setting page will show "1 080 x 1 280" instead of "1080 x
1280"

Test: atest -c <SETTINGS_APP_PATH>/tests/unit/src/com/android/settings/display/ScreenResolutionFragmentTest.java
Test: verified on device
Flag: EXEMPT no API change
Bug: 385895191
Change-Id: I9a4bbd7c20e8c700dee6e997a36d4fda69f4d780
2025-03-14 18:52:45 +00:00
Treehugger Robot
cec2696f62 Merge "Revert "L10n fix for IW locale in storage_summary string"" into main 2025-03-14 03:09:18 -07:00
Treehugger Robot
078fcd0925 Merge "[Satellite] Refactor about content of Satellite setting" into main 2025-03-14 02:22:41 -07:00
Garvita Jain
76943a5b1d Revert "L10n fix for IW locale in storage_summary string"
This reverts commit 4e5595050f.

Reason for revert: <Settings crash in Beta 3>

Change-Id: Icb882eef67904ebbe2ecd3d1eb6620e64453d23b
2025-03-14 01:08:30 -07:00
Garvita Jain
d987500c52 Merge "Revert "[L10n fix] Use whitespace regex for splitting string by delimiter."" into main 2025-03-14 01:02:05 -07:00
tom hsu
c19341db32 [Satellite] Refactor about content of Satellite setting
Flag: EXEMPT refactor
Bug: b/403149290
Test: Manual test pass
Test: atest pass
Change-Id: I55868869a9442648995343c857758c23fe358bc2
2025-03-14 07:42:27 +00:00
Treehugger Robot
b4a1d57206 Merge "[Satellite] Move satellite setting related code to a folder" into main 2025-03-14 00:16:07 -07:00
Garvita Jain
0cac1c2b43 Revert "[L10n fix] Use whitespace regex for splitting string by delimiter."
This reverts commit 08e18d6241.

Reason for revert: <Followup to splitting freespace string>

Change-Id: I169abdd990d94d6a04d0a500b9802ff438c21876
2025-03-13 20:15:41 -07:00
Adrian Roos
3ab16de602 Merge "packages/apps/Settings: remove usages of deprecated Mockito matchers" into main 2025-03-13 13:31:54 -07:00
Amit Talreja (xWF)
bfab8a80d9 Merge "Updated the 2G enable setting title. Bug:391709444 Test: atest Enable2gPreferenceControllerTest Flag: EXEMPT bugfix" into main 2025-03-13 10:47:52 -07:00
tom hsu
93f714446a [Satellite] Move satellite setting related code to a folder
Flag: EXEMPT refactor
Fix: b/403149290
Test: build pass
Test: atest pass
Change-Id: I849adc99fb16d1278efd1d481a4fd99fadb45e98
2025-03-13 16:12:16 +00:00
Shawn Lin
2ed16df7ca Merge "Update biometrics metrics enums" into main 2025-03-13 03:29:22 -07:00
Adrian Roos
693035ab86 packages/apps/Settings: remove usages of deprecated Mockito matchers
Upstream Mockito has deleted the deprecated matchers
in the latest version. Migrate usage to replacements
to unblock upgrade.

Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: I18160e93912d136f3962e3379a68ba2be82c1c78
2025-03-13 09:54:49 +01:00
Shawn Lin
9dfc6173c4 Update biometrics metrics enums
Bug: 370940762
Test: atest FaceSettingsAppsPreferenceControllerTest
            FaceSettingsKeyguardUnlockPreferenceControllerTest
	    FingerprintSettingsAppsPreferenceControllerTest
	    FingerprintSettingsKeyguardUnlockPreferenceControllerTest
Flag: com.android.settings.flags.biometrics_onboarding_education

Change-Id: Iabd5d27358a3cec966210af2fe54079c0d535808
2025-03-13 07:26:24 +00:00
talreja
868299303e Updated the 2G enable setting title.
Bug:391709444
Test: atest Enable2gPreferenceControllerTest
Flag: EXEMPT bugfix

Change-Id: I66bd05441e29b4976343d145ebecaf11fa924b0c
2025-03-12 19:12:48 -07:00
Shawn Lin
a0e0065766 Merge "Launch multiple biometric enrollment when no biometric is enrolled" into main 2025-03-12 19:01:45 -07:00
Vitor Carvalho
67b21fb238 Merge "Update ParentalControlsUtils to use a new utility that is able to retrieve the component for the EnforcedAdmin." into main 2025-03-12 12:00:30 -07:00
Jan Tomljanovic
17f51b712a Merge "Add owners files for safetycenter in settings." into main 2025-03-12 10:47:00 -07:00
Graciela Putri
90cd7eb98c Add LSE App Compat OWNERS for Settings
Flag: EXEMPT adding OWNERS
Fix: 402735141
Test: m
Change-Id: I459bf13bf9ccd067c0ddf067b56ce0e6ecaf4d7d
2025-03-12 07:54:16 -07:00
Vitor Carvalho
89287233f1 Update ParentalControlsUtils to use a new utility that is able to retrieve the component for the EnforcedAdmin.
Bug: 382038943
Flag: android.app.supervision.flags.deprecate_dpm_supervision_apis
Test: atest ParentalControlsUtilsTest
Change-Id: Ic2ecf644f2966bbe2e29c4a691db9e004f0d6a0e
2025-03-12 13:41:21 +00:00
Shawn Lin
c4ee2b83e5 Launch multiple biometric enrollment when no biometric is enrolled
When a user clicks the biometric item in the Device unlock page and no
biometric is enrolled:
- Fingerint clicked: Launch fingerprint enroll then face enroll.
- Face clicked: Launch face enroll then fingerprint enroll.

Bug: 370940762
Test: atest FaceSafetySourceTest FingerprintSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I874b96a75ec0c126ae1674bb6ab220a0a8533fcd
2025-03-12 09:56:39 +00:00
Shawn Lin
50d8d10c58 Merge "Update strings for summary in device unlock page" into main 2025-03-11 19:25:14 -07:00
Jan Tomljanovic
07d1c5067c Add owners files for safetycenter in settings.
Bug: 398185839
Test: not needed
Flag: NONE nothing to test
Relnote: N/a
Change-Id: I5769bba62af30d844e96f3adaef34d53521cd1ca
2025-03-11 14:29:27 +00:00
Treehugger Robot
027bc1cd70 Merge "packages/apps/Settings: remove deprecated Mockito usages" into main 2025-03-08 00:30:31 -08:00
Michael Mikhail
0d44396f76 Merge "[catalyst] migrate media controls settings" into main 2025-03-07 07:27:51 -08:00
tom hsu
76517509a0 Use SatelliteManager API to check device support satellite or not.
Flag: EXEMPT bug fix
Bug: b/401045618
Test: atest pass
Change-Id: Icbf9cf0f8da9c04d8b637f326e3bad7fb2a30916
2025-03-07 11:59:08 +00:00
Chun Zhang
f7a128496c Add WearSafetySource (Without Listener)
Bug: 389841524
Test: TreeHugger
Test: manual
Test: atest SafetySourceBroadcastReceiverTest
Test: atest LockScreenSafetySourceTest
Test: atest ActiveUnlockStatusUtilsTest
Test: atest WearSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I7f4b41bf33d1e0fb7988f756a466e4d80bcec25e
2025-03-05 17:31:26 +00:00
Adrian Roos
d85d04d98a packages/apps/Settings: remove deprecated Mockito usages
Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: Ibfe27bc2399bf1f06d6b790f9fe68d31da60e43a
2025-03-05 06:02:12 -08:00
Menghan Li
86fa16ba52 Merge changes from topics "A11yFeedback1P", "A11yFeedbackTopLevelPage", "AccessibilityPageIdFeatureProvider" into main
* changes:
  refactor(A11yFeedback): Rename AccessibilityMetricsFeatureProvider
  feat(A11yFeedback): Add feedback entry for downloaded Accessibility
  chore(A11yFeedback): Removing Legacy Android M Menu Behavior
  feat(A11yFeedback): Implements page ID to feedback bucket ID mapping
2025-03-05 00:06:01 -08:00
Menghan Li
b511fe690b refactor(A11yFeedback): Rename AccessibilityMetricsFeatureProvider
The AccessibilityMetricsFeatureProvider currently provides page IDs
derived from component names, primarily for metrics purposes.
However, its functionality should be expanded to also support
feedback needs, not just metrics collection, by returning
appropriate settings enum values.

Bug: 393980229
Test: atest AccessibilityMetricsFeatureProviderGoogleImplTest
Flag: com.android.server.accessibility.enable_low_vision_generic_feedback
Change-Id: I2d64db866010ae5e3c6a9738f92860df3d0b86aa
2025-03-05 05:25:05 +00:00
Shawn Lin
10cf921fb7 Update strings for summary in device unlock page
Bug: 370940762
Test: atest FaceStatusUtilsTest
            FingerprintStatusUtilsTest
            ScreenLockPreferenceDetailsUtilsTest
	    FaceSafetySourceTest
	    FingerprintSafetySourceTest
	    FaceStatusPreferenceControllerTest
	    FingerprintStatusPreferenceControllerTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I0927529e939a8e16ddf6692adc8ad427bdbe1bca
2025-03-05 03:11:27 +00:00
Treehugger Robot
26023eb72f Merge "Use Fake context and settings provider to prevent test flakiness" into main 2025-03-03 15:06:43 -08:00
Jan Tomljanovic
6fd9cd771b Merge "Always set source status, even when null." into main 2025-03-03 14:57:37 -08:00
Michael Mikhail
aec68e2372 [catalyst] migrate media controls settings
Flag: com.android.settings.flags.catalyst_media_controls
Fixes: 337243570
Fixes: 389133530
Fixes: 389133114
Test: atest MediaControlsLockScreenSwitchPreferenceTest
Test: atest MediaControlsSwitchPreferenceTest
Change-Id: Ibe8fed064cd6223085764f5125cff45a9bea734d
2025-03-03 22:50:05 +00:00
Matthew DeVore
0a583b223e Connected displays: use Robolectric for tests
Use Robolectric for tests so that we don't have to deploy to a device
emulator. TestHandler is not available in Robolectric tests, so this CL
includes a substitute.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: atest <all moved tests>
Bug: b/399743032
Change-Id: I95721d9b90376374da7011e42c70e474b494e992
2025-03-03 10:37:48 -06:00
Matthew DeVore
ded1d1c0d6 CD settings: minimal DisplayDevice metadata class
This saves tests from interacting with DisplayManager completely,
simplifies the Injector API, and makes mocking that API easier. This
addresses the first difficulty I had in converting our tests to
Robolectric.

Bug: b/399743032
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: verify disabled and enabled displays appear correctly in display list fragment
Test: atest ExternalDisplayPreferenceFragmentTest.java
Test: atest ExternalDisplayUpdaterTest.java
Test: atest ResolutionPreferenceFragmentTest.java
Change-Id: Id43d2f108f3e85e6596eb2271b1de6b1afd2338f
2025-03-03 10:37:48 -06:00
Chun-Ku Lin
877f2a6d35 Use Fake context and settings provider to prevent test flakiness
**Root cause**
The ReduceBrightColorsIntensityPreferenceControllerTest would modify the
settings during test. However, since this is a unit test, it shouldn't
trigger modifying the brightness on the attached test device. Otherwise,
the test would be unstable depends on how stable the device is, which
should be tested by the integration test.

Bug: 397762527
Test: abtd
Flag: EXEMPT test only
Change-Id: I0c0d7327d4356482295121c11c3a1e5ed814ffec
2025-02-28 23:59:34 +00:00
Matthew DeVore
02fff0174f Show options greyed out inactive display
Test: ExternalDisplayPreferenceFragmentTest
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/398846256
Change-Id: I6020212843c10867447809910a0202b7dbacd909
2025-02-27 09:43:04 -06:00
Matthew DeVore
29132988b2 Merge "Show expanded display settings in list fragment" into main 2025-02-27 07:22:05 -08:00