Commit Graph

2092 Commits

Author SHA1 Message Date
Xin Li
10d930d1cf Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
Bug: 385190204
Merged-In: I04f90b42907d07c6111a7b41a531f7717df33672
Change-Id: I58e92a6e45193de820f7432dcb365c41c14d3141
2025-03-06 12:22:41 -08:00
Xin Li
5bfde9fbf5 Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
Owner Cleanup Bot
3aee441d2c [owners] Remove aroederer@google.com from src/com/android/settings/notification/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/aroederer@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Ifa12fa8e045776b6351530a5f1341311046e9a1c
2025-01-26 08:24:44 -08:00
Matías Hernández
f496cf6fb9 Fix NPE on modes page when schedule has no days
Fixes: 387088843
Test: atest ZenModeTriggerUpdatePreferenceControllerTest
Flag: EXEMPT trivial bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5098df9b6c2a7caff5dde39911c70e35f2aacbe7)
Merged-In: I3b845784f5923521d7f3f6cae9d6d27a21f55361
Change-Id: I3b845784f5923521d7f3f6cae9d6d27a21f55361
2025-01-10 10:37:55 -08:00
Daniel Chapin
c8e84e540f Revert "Migrate materialColor* attributes into colors"
Revert submission 29910036-color-rewrite

Reason for revert: DF Blocking bug:b/383230490 . Reverts will be cherry picked for a .003 release build.

Reverted changes: /q/submissionid:29910036-color-rewrite
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed8074008f149acf8e1d472866803ff74c7a5d20)
Merged-In: I1229283119cbebb6f6e837b7bbd65480299086c4
Change-Id: I1229283119cbebb6f6e837b7bbd65480299086c4
2024-12-10 19:49:08 +00:00
Marcelo Arteiro
8577c10535 Migrate materialColor* attributes into colors
The new color were already introduces in a previous CL ag/30322786

This CL is about replacing the attribute usage by the new color resources, which should work the same but cannot be overwritten, or styled, guaranteeing consistency across the OS.

The old attributes will be removed in CL: ag/29910036

Bug: 374273611
Test: presubmit
Flag: EXEMPT Un-flaggable refactor of private color resources
Change-Id: I05b5261054bcb6de40e4e40d633025495f3dd01f
2024-12-06 16:55:33 +00:00
Yining Liu
85aa7f7c86 Replace the existing notifications on lock screen preferences with new page
Replace the existing notifications on lock screen preferences with the new
notifications on lock screen page entries.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: Manual, Settings - Display & touch - Lockscreen; Settings - Security &
privacy - More security & privacy

Change-Id: I858f84db8b5c09895d6b196426b32b3bfbd80d15
2024-12-04 22:08:25 +00:00
Yining Liu
81d390968b Implement the preference switch for minimalism on ls settings page
Implement the preference switch for notification minimalism on the
notifications on lock screen settings page. The illustrations and
summaries will also update when switching the preference. This
preference will hide when the main toggle is unset or when the lock
screen notification minimalism feature flag is disabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_notification_minimalism <1|0>
Change-Id: Ie6596e518bd1aa2e828587d7d174b57256aec45b
2024-12-04 22:08:25 +00:00
Yining Liu
bd6561accf Implement the Hide seen notifications toggle
Implement the Hide seen notifications toggle on the notifications on
lock screen page. The toggle will become invisible
when the main toggle is unset or when the lock screen notification
minimalism feature flag is disabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_show_notifications <1|0>
Change-Id: I6f94be3295dfbaa978d145d113e03cacc1a232fc
2024-12-04 22:08:24 +00:00
Yining Liu
4c507b1132 Implement the hide silent notifications toggle
Implement the hide silent notifications toggle on the notifications
on lock screen page. This toggle will become invisible when the main
toggle is unset. This toogle will replace the existing Notifications
- notifications on the lock screen - hide silent conversations and
notifications preference when the flag is enabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings put secure \
 lock_screen_show_silent_notifications <1|0>
Change-Id: Icc0b26afd199ec3f14237fd1cdb27981383ae69f
2024-12-04 22:03:12 +00:00
Yining Liu
c16c9b2df6 Implement the show sensitive content toggle
Implement the show sensitive content only when unlocked toggle on the
notifications on lock screen page. The toggle will become invisible
when the main toggle is unset or when there's no screen locks.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_allow_private_notifications <1|0>
Change-Id: I174478540c4cc2e2df7047049671266041dd41cf
2024-12-04 18:53:35 +00:00
Yining Liu
0d75a26a68 Implement the main switch of notifications on lock screen
Add the ability of controlling whether to show notifs on the lock
screen (secure setting: lock_screen_show_notifications) to the new
lock screen notification settings page main switch. This switch also
listens to the change of lock_screen_show_notifications to update
its status in case of other places change the value.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest
Change-Id: Id598d508ac383563a0d9413578251eb22ed4ca90
2024-12-04 18:53:32 +00:00
Yining Liu
9836d6a69a Add the new settings page for lock screen notifs
Add a new empty settings page, which is flag-guarded. When the flag
is disabled, show the original Notifications on lock screen
tri-state switch, otherwise show the new page.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest

Change-Id: I8a81ad651626f39380767b2c9cfa2f1c19d0e7c5
2024-12-04 00:30:05 +00:00
Treehugger Robot
f92c187b11 Merge "[Catalyst] Ring volume migration (2/n)" into main 2024-12-02 10:41:39 +00:00
Mill Chen
a2b94eafde [Catalyst] Ring volume migration (2/n)
NO_IFTTT=migrate other feature from controller

Bug: 373978964
Test: atest SeparateRingVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: I4aba4c6688e4284fb23570ac999acf7b4039854d
2024-11-29 17:10:11 +00:00
Treehugger Robot
8ff5f0cfc5 Merge "[Settings] Fix inconsistent ringtone keyword search" into main 2024-11-29 03:27:08 +00:00
Jacky Wang
8a97245b3d [Catalyst] Add sensitivity level
NO_IFTTT=Catalyst only

Bug: 380457585
Flag: com.android.settings.flags.catalyst
Test: Manual
Change-Id: Ia98a925011723738e1a16cc0e0c3d703d3dbd505
2024-11-29 07:36:13 +08:00
Wilson Wu
409e5f5697 [Settings] Fix inconsistent ringtone keyword search
The settings keyword search result is based on xml.
Hide the phone ringtone preference if the device
support ringtone vibration.

Flag: EXEMPT bugfix
Bug: 379006466
Test: atest PhoneRingtonePreferenceControllerTest
Change-Id: I42d2518c524ab26525445f766e14049c59a8d6ee
2024-11-28 03:42:01 +00:00
Jacky Wang
e635f1e0ed [Catalyst] Support Getter API for settings service
NO_IFTTT=Catalyst only

Bug: 373895596
Flag: com.android.settings.flags.catalyst_service
Test: devtool
Change-Id: I367f350d2192d1285bf355a9e45c2d9bec11fa44
2024-11-16 08:06:28 +08:00
Matías Hernández
0cf61ba759 Merge "Hide the blurb for custom-manual types" into main 2024-11-14 23:32:00 +00:00
Matías Hernández
1f24f061b4 Hide the blurb for custom-manual types
Fixes: 377691826
Test: manual
Flag: android.app.modes_ui
Change-Id: I3c959f32c7ae1cc2c95fb4e9180e2f871ed3ee91
2024-11-14 20:26:40 +00:00
Matías Hernández
0baf70a4b3 Exclude implicit modes from the summary of the Modes entry in Settings
They are called "Do Not Disturb (App)" which places alphabetically near the top (in English). This can often result in a summary like "DND, Bedtime, DND (App)", which looks silly.

Fixes: 379089451
Test: atest ZenModeSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: Id41caee09cca874297ca12d2ac934aed3f9a43ab
2024-11-14 15:33:54 +00:00
Matías Hernández
68158ee324 Merge "Use full day names in the a11y version of schedules in mode list descriptions" into main 2024-11-13 12:16:07 +00:00
Treehugger Robot
70b962a8a5 Merge "Handle null audio attributes" into main 2024-11-12 23:15:13 +00:00
Julia Reynolds
987d14b8df Merge "reduce number of binder calls when loading page" into main 2024-11-12 22:00:26 +00:00
Julia Reynolds
d6c932cd7e Handle null audio attributes
Test: SoundPreferenceControllerTest
Fixes: 358540739
Flag: EXEMPT bugfix
Change-Id: I9a0e6066ccc2315b276564178c13ed59dd22162b
2024-11-12 20:27:23 +00:00
Julia Reynolds
a37572a4e5 reduce number of binder calls when loading page
Test: ZenModeAllBypassingAppsPreferenceControllerTest
Test: ZenModeAppsLinkPreferenceControllerTest
Test: manual - load page and validate that it loads a few seconds faster
Flag: EXEMPT bug fix
Fixes: 368623163
Change-Id: I6d34a21f0948b117a96beefc405de4b623f49609
2024-11-12 18:29:41 +00:00
Jacky Wang
865e9b29f5 [Catalyst] Support multiple restriction keys
NO_IFTTT=Catalyst only

Bug: 377600992
Flag: com.android.settings.flags.catalyst
Test: testdpc
Change-Id: If7212b5402f7e271b7fdbd2a43bed0e11ee6f15f
2024-11-12 13:19:16 +08:00
Matías Hernández
3863c67a01 Use full day names in the a11y version of schedules in mode list descriptions
Bug: 370358575
Test: atest ZenModesListItemPreferenceTest
Flag: android.app.modes_ui
Change-Id: I5d22b878c1d685476cf71167e7163be65416da68
2024-11-08 17:24:01 +01:00
Treehugger Robot
0f687eafc5 Merge "Fix stray ProfileSelectDialog when only one profile exists" into main 2024-11-07 19:09:43 +00:00
Matías Hernández
b152c2d34f Fix stray ProfileSelectDialog when only one profile exists
Fixes: 377829434
Test: atest ZenModePrioritySendersPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Ia5f667fd937107af98dfb3a073cadeb935ff8a8a
2024-11-07 18:52:59 +01:00
Julia Reynolds
106738a1b1 Merge "Add skeleton page for bundling" into main 2024-11-06 16:59:57 +00:00
Jacky Wang
d33b0a5114 [Catalyst] Support restriction for Sound settings
NO_IFTTT=Catalyst only

Bug: 377600992
Flag: com.android.settings.flags.catalyst_sound_screen
Test: testdpc
Change-Id: I2d768155f450f415c2279bbff69f94e8934b4383
2024-11-06 12:01:03 +08:00
Jacky Wang
3551614baf Implement RestrictedPreferenceHelperProvider for restricted preference
Bug: 377600992
Flag: EXEMPT library
Test: Manual
Change-Id: I73e60ea7a392aac96e701b9d7f0ff617e449f3b2
2024-11-06 11:43:42 +08:00
Julia Reynolds
976850dbdd Add skeleton page for bundling
Test: BundleTypePreferenceControllerTest
Test: BundleGlobalPreferenceControllerTest
Test: BundlePreferenceControllerTest
Fixes: 376476949
Flag: android.app.notification_classification_ui
Change-Id: I6fa7ddfeb5ee6d2033dee4b57b0cc0e76bb347f6
2024-11-05 17:03:40 +00:00
Jacky Wang
5329552b74 [Catalyst] Allow external SET for Display/Sound settings
NO_IFTTT=Catalyst only

Bug: 360015496
Bug: 368359268
Flag: com.android.settings.flags.catalyst
Test: devtool
Change-Id: I61b2b4b78eba1ca41aa3e5cbfea41c0be9474d0b
2024-11-04 04:15:39 +08:00
Jacky Wang
dbcdbe85e7 [Catalyst] Provide launch intent for Sound settings
Bug: 360015496
Flag: com.android.settings.flags.catalyst_sound_screen
Test: devtool
Change-Id: Ifaf0a14d0b94682615400b2aec4f9c7cebc7794f
2024-11-04 04:14:33 +08:00
Mill Chen
7c9379e5d2 [Catalyst] Ring volume migration (1/n)
Bug: 373978964
Test: atest SeparateRingVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: Ibf8f546c84ffb5467f62a250de37d96b5c974e15
2024-10-31 10:22:56 +00:00
Mill Chen
75b443375f [Catalyst] Media volume migration
Bug: 364898461
Test: atest MediaVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: I172f336a7d1c843d071dd920d29aa35b4a1a8aaf
2024-10-31 02:43:34 +00:00
Jacky Wang
4ad4f35f78 [Catalyst] Specify order in hierarchy
NO_IFTTT=Update preference order

Bug: 332201912
Flag: EXEMPT refactor
Test: Manual
Change-Id: Iae99e699d852229779ea41a1cbc92bba47684a7b
2024-10-29 20:51:51 +08:00
Treehugger Robot
9a022bcffb Merge "[Catalyst] Call volume migration" into main 2024-10-29 05:28:28 +00:00
Treehugger Robot
3748eec701 Merge "Refactor sound settings page for catalyst" into main 2024-10-29 05:26:33 +00:00
Mill Chen
8f4f371131 [Catalyst] Call volume migration
Bug: 364898621
Test: atest CallVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: I1464bd42fde7e0ae9063e2319c674b5e439b97f9
2024-10-29 04:25:13 +00:00
Mill Chen
3f1c7b0f49 Refactor sound settings page for catalyst
We have preferences existing in the sound settings page and new sound
screen. In order to ensure VolumeSeekBarPreferences work smoothly,
this changes support adding callback handling to
VolumeSeekBarPreferences that are migrated in the new screens.

Bug: 360015496
Test: visual test
Flag: EXEMPT refactor the existing feature
Change-Id: Iaee4581f1c2687db0b405cd9edbfef2088d9bb12
2024-10-29 04:23:16 +00:00
Julia Reynolds
cc8e87b0a5 Merge "Fix incorrect Settings assumption" into main 2024-10-28 18:32:00 +00:00
Matías Hernández
f201899e7c Merge "Add TtsSpan to schedule-time modes trigger segment so that full day names are read" into main 2024-10-28 16:26:40 +00:00
Julia Reynolds
451bd65471 Fix incorrect Settings assumption
Most apps will not have 4 bundle channels, even when
the flag is on

Test: BundleListPreferenceControllerTest
Fixes: 375674236
Flag: android.service.notification.notification_classification
Change-Id: Iab8e241881f9af71744b46fce356604cf9ed369c
2024-10-28 10:40:08 -04:00
Matías Hernández
1e8933123a Add TtsSpan to schedule-time modes trigger segment so that full day names are read
Bug: 370358575
Test: atest ZenModeTriggerUpdatePreferenceControllerTest + manual with Talkback
Flag: android.app.modes_ui
Change-Id: Ia9ed53c75176d887f26da90a713f1038cf26e01f
2024-10-28 12:01:10 +01:00
Matías Hernández
a9e8225ba4 Update summary of Modes entry in Settings
Instead of the number of automatic modes, simply list the first (up to 3) existing modes, according to the standard sort order, when none are active.

As a consequence, the summary is never empty now.

Fixes: 374179941
Test: atest ZenModeSummaryHelperTest + manual
Flag: android.app.modes_ui
Change-Id: I04f9d90a5e1e4ed13d66181b85d77fef8c6ff256
2024-10-24 16:18:50 +02:00
Matías Hernández
5c751da617 Merge "Change the icon in the trigger segment for TYPE_DRIVING modes" into main 2024-10-23 18:06:09 +00:00