Commit Graph

146414 Commits

Author SHA1 Message Date
Matthew DeVore
eeec7d0d66 Run body of applyTopology for all non-noop drags
In onBlockTouchUp, if DisplayTopology.rearrange happened to revert the
change made by the drag so that it matched the before-drag layout, the
blocks would not be moved, so the block would be in the dragged position
but not the normalized position.

This will happen when rearrange has a bug or is otherwise optimizing the
layout, which is dependent on the implementation of rearrange.

The test field mTimesReceivedSameTopology has been replaced with one
that represents an observable positive operation:
mTimesRefreshedBlocks, the validation of which has been added to some
existing tests.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: move display so that rearrange reverts the change, then exit and re-enter the external display fragment, and verify it matches the state when left
Test: DisplayTopologyPreferenceTest
Bug: b/394361999
Bug: b/394355269
Change-Id: Ic3028747d283db77f144831352b7687fe2706391
2025-02-07 12:58:06 -06:00
Liefu Liu
ce463e4142 Merge "Updated the Contacts Storage Settings' bottom line text." into main 2025-02-05 15:06:42 -08:00
Treehugger Robot
c47c644696 Merge "[Catalyst] Remove the INTERACT_ACROSS_PROFILES for Mobile data" into main 2025-02-05 12:46:00 -08:00
Vitor Carvalho
4f4e2da16b Merge "Fix tests in Settings that break with the changes in ParentalControlsUtils introduced in ag/31121556." into main 2025-02-05 10:36:07 -08:00
Junchen Quan
74aefe07d3 Merge "Add PIN recovery entry in supervision PIN management page." into main 2025-02-05 10:07:45 -08:00
Bill Yi
5d263c7481 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-05 10:05:36 -08:00
Treehugger Robot
da53986a15 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-05 09:49:20 -08:00
Treehugger Robot
cedaf609d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-05 09:49:20 -08:00
Liefu Liu
b197bfe8f2 Updated the Contacts Storage Settings' bottom line text.
Bug: 394335832
Test: unit test and manual test
Flag: EXEMPTED

	modified:   res/values/strings.xml
	modified:   tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java

Change-Id: Ibde23352a6c64ff7ea546e2fd5ef9468398829f7
2025-02-05 08:49:17 -08:00
Treehugger Robot
e9722accbd Merge "[Catalyst] Add more constants to SettingsContract" into main 2025-02-05 04:06:55 -08:00
Ebru Kurnaz
1d71ed9d3d Merge "Add a preference for display size settings." into main 2025-02-05 03:12:11 -08:00
Jacky Wang
ef3b232523 [Catalyst] Add more constants to SettingsContract
Bug: 388061003
Flag: EXEMPT refactor
Test: N/A
Change-Id: I906b345a56fa87909411ef64c73e2696240388ae
2025-02-05 19:02:41 +08:00
Shawn Lin
d40442c91f Merge "[Biometric Onboarding & Edu] Update face settings page" into main 2025-02-05 02:52:09 -08:00
Vitor Carvalho
a796ca497a Merge "Update EnterprisePrivacyFeatureProviderImpl to obtain the parental controls intent from SupervisionIntentProvider." into main 2025-02-05 02:47:01 -08:00
Shraddha Basantwani
43dc7840ef [automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df am: 760b9fb16d -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 891d4be094 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364

Change-Id: I04945aafdad73519c25dcb3bdbe61580194890de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-05 01:56:21 -08:00
Shraddha Basantwani
760b9fb16d Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364

Change-Id: I6b3c68bd4b23f34eb4a7cdc048faf0ad6588a62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-05 01:55:22 -08:00
Shraddha Basantwani
1c5b48c8df Merge "[SPA] Add biometric authentication for package modification" into udc-dev 2025-02-05 01:49:56 -08:00
Shawn Lin
d747235a4c [Biometric Onboarding & Edu] Update face settings page
- Added a feature provider for face settings page in FaceFeatureProvider
  for customization
- When face is deleted, disabled the settings buttons instead of hiding
  them.
- Updated new UX style for add/remove face button.

Bug: 370940762
Test: atest FaceSettingsEnrollButtonPreferenceControllerTest
            FaceSettingsFooterPreferenceControllerTest
Test: manual - 1. Enroll face
               2. Go Face Settings page and remove face
	       3. Enroll face again
Flag: com.android.settings.flags.biometrics_onboarding_education

Change-Id: I490e647523eeff2dd1a58aab07f638e3e5e0ffb8
2025-02-05 00:57:40 -08:00
Shraddha Basantwani
27315b3b92 [SPA] Add biometric authentication for package modification
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages

Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest PackageInfoPresenterTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2025-02-05 00:12:40 -08:00
Sunny Shao
d533c3e568 [Catalyst] Remove the INTERACT_ACROSS_PROFILES for Mobile data
NO_IFTTT=Catalyst only

Bug: 385282727
Flag: com.android.settings.flags.catalyst_mobile_network_list
Test: devtool
Change-Id: Ic664f6e8974eceaf74c8741d6122a2d0e3e679c9
2025-02-05 05:58:39 +00:00
yqian
4dfe488d8b [Cleanup] remove flag enable_bonded_bluetooth_device_searchable
the feature is enabled in prod already

Test: atest ConnectedDeviceGroupControllerTest
Bug: N/A
Change-Id: I7b2674bd42ed0a3bbe03c74ff52c3ccd830178dc
Flag: EXEMPT just cleanup
2025-02-04 21:35:12 -08:00
Treehugger Robot
1436ea1351 [automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-qpr-dev am: 06151a58c6 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 32e388ad31 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686359

Change-Id: Ic4072860f67d5955f46148caa16906d90804e95e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-04 21:20:11 -08:00
Shraddha Basantwani
7f653bb7a6 [automerger skipped] [SPA] Add biometric authentication for package modification am: 891d4be094 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 32e388ad31 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686359

Change-Id: Ifda0762938a656966bfaa76d8e7f1fda2d0b4f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-04 21:20:03 -08:00
Treehugger Robot
06151a58c6 Merge "[SPA] Add biometric authentication for package modification" into udc-qpr-dev 2025-02-04 20:46:20 -08:00
Hakjun Choi
be6525024d Merge "Clean up aconfig flag oem_enabled_satellite_flag" into main 2025-02-04 19:31:29 -08:00
Shaowei Shen
fd57eb5bb3 Merge "[Physical Keybaord] Fix Mouse key image truncate" into main 2025-02-04 19:17:34 -08:00
Jeff DeCew
6aa546ceb9 Merge "Add minimalism illustrations to the lock screen notifications settings page" into main 2025-02-04 18:57:23 -08:00
Treehugger Robot
b5299b17d9 Merge "fix(high contrast text): Uses a new string resource for the settings action." into main 2025-02-04 16:24:08 -08:00
Matthew DeVore
ef1543fe6b Merge "Hide v1 conn. display illust. and Use toggles" into main 2025-02-04 15:56:51 -08:00
Yining Liu
b602e4b0fc Merge "Fix the toggle status for show sensitive content switches" into main 2025-02-04 15:26:44 -08:00
Daniel Norman
f6b3ccd074 fix(high contrast text): Uses a new string resource for the settings action.
The old string has all non-English translations without format
placeholders, which will fail to build the string on those
languages until translations are added.

Bug: 384791485
Flag: com.android.graphics.hwui.flags.high_contrast_text_small_text_rect
Change-Id: I4565610908d463c05576d5c5d0b083f76802cc9e
2025-02-04 15:26:24 -08:00
Yining Liu
ed4e9d6c92 Merge "Notification on lockscreen settings: default unseen setting value" into main 2025-02-04 15:25:25 -08:00
Riley Jones
a1e47ef860 Merge "Update strings again for refreshed High Contrast Text" into main 2025-02-04 15:17:23 -08:00
Yining Liu
466e16bfc9 Add minimalism illustrations to the lock screen notifications
settings page

Add static version minimalism illustrations to the lock screen
notifications settings page. We still need to replace the icons.

In the final version, illustrations will combine the light and dark
versions into a single file. The current status is a middle stage
stands for team fooding. The final version illustrations will also be
animations instead of static.

Bug: 367455695
Bug: 383778222
Flag: com.android.server.notification.notification_lock_screen_settings
Test: manual
Change-Id: I63c0452de60ce1aa94c7b414cb6e81dd98c5f361
2025-02-04 15:11:54 -08:00
Justin Weir
5851927407 Merge "Add super call to onCreateView" into main 2025-02-04 15:08:12 -08:00
Ebru Kurnaz
32c45640ad Merge "Add a flag for display size settings for connected displays." into main 2025-02-04 15:00:25 -08:00
Justin Weir
bd5eefb017 Add super call to onCreateView
Bug: 392487897
Test: Ran LockscreenWithOverSixDigitPIN with and without this change
Flag: EXEMPT small bug fix
Change-Id: Ieaba6222f9751d4e87040a5cb59d0364fe153700
2025-02-04 16:02:05 -05:00
Julia Reynolds
d46bed9b13 Merge "Add app level settings for classification and summarization" into main 2025-02-04 12:56:49 -08:00
Ebru Kurnaz
fb9fdc951b Add a preference for display size settings.
Currently slider is not functioning.

Flag: com.android.settings.flags.display_size_connected_display_setting
Test: atest ExternalDisplayPreferenceFragmentTest
Bug: 392853666
Change-Id: Ibcb55bc939a38dad58451b2a0db4a59f5aa28e5f
2025-02-04 20:37:28 +00:00
Ebru Kurnaz
efa318c419 Add a flag for display size settings for connected displays.
Flag: com.android.settings.flags.display_size_connected_display_setting
Test: NA
Bug: 392853666
Change-Id: If31d7786bea7fa17b9da3e77f47e3dc060fc6b1d
2025-02-04 20:02:25 +00:00
juquan
26ea7df1d5 Add PIN recovery entry in supervision PIN management page.
Bug: b/390500290
Change-Id: I942fad663d0fb731215707d7c0b18359242aecb0
Test: atest SupervisionPinRecoveryPreferenceTest
Flag:android.app.supervision.flags.enable_supervision_pin_recovery_screen
2025-02-04 19:10:01 +00:00
Julia Reynolds
55441003d3 Add app level settings for classification and summarization
Test: AdjustmentKeyPreferenceControllerTest
Flag: android.app.nm_summarization
Flag: android.app.notification_classification_ui
Flag: android.app.nm_summarization_ui
Bug: 377697346
Bug: 390412878
Change-Id: I85b67b5c0376ee4cd962e26bf178aae6fa712212
2025-02-04 10:53:57 -08:00
Matthew DeVore
cefb6ac11f Hide v1 conn. display illust. and Use toggles
In the rotation/resolution preference UI, stop showing UI parts which
are only applicable in the original connected display UI. We will still
show them if the topology pane is disabled.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/366056922
Test: manual
Change-Id: I2897576d5e7eb69a43bf17b967e2ae5f0321998c
2025-02-04 12:51:40 -06:00
Bill Yi
827b208d65 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic6ddcfcfc79aa6ead0e271334494524f2e7f58c3
2025-02-04 10:51:32 -08:00
Bill Yi
9f9120d919 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I94310665678c9cdca99fe6c52d7a277534d012d2
2025-02-04 10:49:19 -08:00
Bill Yi
8fa76a26ca Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iab23ddac71fde453ca8d8a8b62c30a8a02a15d5d
2025-02-04 10:47:37 -08:00
Matthew DeVore
883070758b Merge "Show a category for each external display" into main 2025-02-04 10:38:14 -08:00
Wes Okuhara
2701724b02 Merge "Settings: Add tethering strings for device product type" into main 2025-02-04 10:14:19 -08:00
Liefu Liu
121036ee7e Merge "Minor UI string change in Contacts Storage Setting." into main 2025-02-04 08:35:56 -08:00
Treehugger Robot
d6e366ae32 Merge "[Catalyst] Implement AirplaneModePreference.tags" into main 2025-02-04 06:38:34 -08:00