Commit Graph

2905 Commits

Author SHA1 Message Date
tom hsu
c8b730509d [Satellite] Restrict requestIsSupported only in Manual type
- SatelliteManager#requestIsSupported only can be used in Manual
   conneciton type. Hence add a type check with this API for the
   condition check

Flag: EXEMPT bug fix
Fix: b/395811260
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d033f603b819c5b1264d116648c9f6f00b061320)
Merged-In: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
Change-Id: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
2025-03-31 20:54:29 -07:00
tom hsu
e9e45b4a01 [Satellite] Refactor API usage to Util class.
Flag: EXEMPT refactor
Fix: b/403149290
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8916db934fb3d7dc1f94f67c7b409beeff2c6ac6)
Merged-In: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
Change-Id: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
2025-03-31 20:54:17 -07:00
tom hsu
ef8acb4757 Ignore test to avoid test failed
- This is a work around to avoid test failed then take time to look
   into the root cause.

Flag: EXEMPT bug fix
Bug: b/405279842
Test: atest pass
Change-Id: Idfbf606ed3edf0d7bc4a48b4498e8bdf5a0984c8
2025-03-21 15:58:45 +00:00
Treehugger Robot
5540cd1606 Merge "[Satellite] Show category of Your data plan with Manual connection type." into main 2025-03-20 22:05:59 -07:00
tom hsu
0569647a24 [Satellite] Show category of Your data plan with Manual connection type.
- When satellite entitlement is unsupported, it shall show the category of Your data plan with Manual connection type.

Flag: EXEMPT bug fix
Fix: b/405250203
Test: atest pass
Change-Id: I91c5be123d59753d93db37226d0ae17ebb5ea1f5
2025-03-20 20:42:00 -07:00
Shawn Lin
d7c403acae Merge "Reland:Launch multiple biometric enrollment when no biometric is enrolled" into main 2025-03-19 20:02:06 -07:00
Shawn Lin
97eb57186c Reland: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.

Also fixed work profile not working issue:
- Use BiometricEnrollActivity.InternalActivity to provide correct userId
  for work profile.
- Use the canAuthenticate() function that take userId as input.

Bug: 370940762
Test: atest FaceSafetySourceTest FingerprintSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I0800c5bb71cc3813e0336ed65898d099857175ef
2025-03-19 11:06:37 +00:00
tom hsu
dc788ed9d1 [Satellite] Use satellite data mode for UX visibility
- Use SatelliteManager#getSatelliteDataSupportMode() to check data
   restricted or not.

Flag: EXEMPT bug fix
Bug: b/401043401
Test: atest pass
Test: Manual test
Change-Id: I6f3e25610717eca0f6e871a9e1158422659058ea
2025-03-19 09:45:52 +00:00
Yuanru Qian
0a4000d723 Merge "Update the audio sharing QR code logic to enable OEMs providing customized QR code image" into main 2025-03-19 00:24:22 -07:00
tom hsu
9896b590d3 [Satellite] Change footer format in satellite setting
- Use controller base design instead of current

Flag: EXEMPT bug fix
Bug: b/401648126
Fix: b/402037025
Test: Manual test
Test: atest pass
Change-Id: Icb3fd6a1c5340e554593fc57cb238bf98d3ed0e3
2025-03-18 22:59:38 -07:00
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
yqian
d4774b37aa Update the audio sharing QR code logic to enable OEMs providing customized QR code image
Test: atest AudioSharingFeatureProviderImplTest
Bug: b/397137711
Flag: EXEMPT no-op

Change-Id: I124d6ded50faf9fa0ca06bd5b34d72e9399f3e59
2025-03-12 18:00:42 +08: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