Chaohui Wang 8a701766fb Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220 am: 447f77c07d am: a64429b8e8 ...

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

Change-Id: I032de9c1b368c7a7c4743fd4695511f063bc0598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-05-25 15:41:25 +00:00

..

app

Fix Conversation page flickers

2022-05-25 10:43:16 +08:00

history

Update the 'is valid contentIntent' check

2022-05-13 17:37:52 +00:00

zen

Change zen mode schedules page rule handling

2022-05-05 14:24:42 -04:00

AdjustVolumeRestrictedPreferenceController.java

…

AlarmRingtonePreferenceController.java

…

AlarmVolumePreferenceController.java

…

AppBubbleListPreferenceController.java

…

AudioHelper.java

…

BadgingNotificationPreferenceController.java

…

BootSoundPreferenceController.java

…

BubbleNotificationPreferenceController.java

…

BubbleNotificationSettings.java

…

BubbleSummaryNotificationPreferenceController.java

…

CallVolumePreferenceController.java

…

CastPreferenceController.java

…

ChargingSoundPreferenceController.java

…

ConfigureNotificationSettings.java

Allow overriding of strings referenced in XML files.

2022-02-07 21:00:05 +00:00

ConversationListSummaryPreferenceController.java

…

DefaultNotificationTonePreference.java

…

DialPadTonePreferenceController.java

…

DockAudioMediaPreferenceController.java

…

DockingSoundPreferenceController.java

…

EmergencyBroadcastPreferenceController.java

…

EmergencyTonePreferenceController.java

…

ImportanceResetPreferenceController.java

…

LockScreenNotificationPreferenceController.java

Add missing settings strings.

2022-05-05 09:12:59 +00:00

MediaVolumePreferenceController.java

[LE] Launch the dialog for the user to broadcast or find broadcast

2022-05-03 03:16:08 +00:00

NotificationAccessConfirmationActivity.java

Extract app label from component name in notification access confirmation UI

2022-05-04 19:41:13 +00:00

NotificationAccessSettings.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

NotificationAssistantDialogFragment.java

…

NotificationAssistantPicker.java

…

NotificationAssistantPreferenceController.java

…

NotificationBackend.java

Use NMS calculation of fixed importance

2022-05-11 16:38:04 +00:00

NotificationButtonRelativeLayout.java

…

NotificationRingtonePreferenceController.java

…

NotificationVolumePreferenceController.java

…

OWNERS

Update notification settings OWNERS

2022-01-25 21:38:29 +00:00

PhoneRingtonePreferenceController.java

…

PulseNotificationPreferenceController.java

…

RedactionInterstitial.java

Add missing settings strings.

2022-05-05 09:12:59 +00:00

RedactionSettingsStandalone.java

…

RedactNotificationPreferenceController.java

Fix Settings getProfileIdsWithDisabled usage

2022-04-27 18:34:07 -07:00

RemoteVolumeGroupController.java

Fix group cast volume slider not disabled after switching to group

2022-03-24 08:12:40 +00:00

RemoteVolumeSeekBarPreference.java

…

RingtonePreferenceControllerBase.java

…

RingVolumePreferenceController.java

…

ScreenLockSoundPreferenceController.java

…

SettingPref.java

…

SettingPrefController.java

…

SettingsEnableZenModeDialog.java

…

ShowOnLockScreenNotificationPreferenceController.java

…

SilentStatusBarPreferenceController.java

…

SnoozeNotificationPreferenceController.java

…

SoundSettings.java

Add setting for showing the vibrate icon in status bar

2022-02-23 15:42:57 +00:00

SoundWorkSettings.java

Add missing settings strings.

2022-05-05 09:12:59 +00:00

SoundWorkSettingsController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

SpatialAudioParentPreferenceController.java

SpatialAudioSettings: Fix state check

2022-05-05 20:25:12 -07:00

SpatialAudioPreferenceController.java

DO NOT MERGE Add setting page for the Spatial audio

2022-03-20 15:55:53 +00:00

SpatialAudioSettings.java

Update Spatial audio settings page

2022-05-18 09:21:01 +00:00

SpatialAudioWiredHeadphonesController.java

DO NOT MERGE Add setting page for the Spatial audio

2022-03-20 15:55:53 +00:00

SuppressorHelper.java

…

SwipeDirectionPreferenceController.java

…

TouchSoundPreferenceController.java

…

VibrateIconPreferenceController.java

Add setting for showing the vibrate icon in status bar

2022-02-23 15:42:57 +00:00

VolumeSeekBarPreference.java

Add the jank detection to Settings sliders

2022-05-03 11:06:34 +00:00

VolumeSeekBarPreferenceController.java

…

WorkSoundsPreferenceController.java

…