András Kurucz e06c0d905e Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev am: 80095fa001 ...

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

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

2022-11-28 16:57:05 +00:00

..

AddToHomeScreenPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

AllConversationsPreferenceController.java

Fix Conversation page flickers

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

AllowSoundPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

AppBubbleNotificationSettings.java

Add filtering to notification channel settings

2021-02-16 14:40:26 -05:00

AppChannelsBypassingDndPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

AppChannelsBypassingDndSettings.java

Add filtering to notification channel settings

2021-02-16 14:40:26 -05:00

AppConversationListPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

AppLinkPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

AppNotificationSettings.java

Clean up notification settings

2021-06-18 14:36:20 -04:00

BadgePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BlockPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BubbleCategoryPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BubbleLinkPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BubblePreference.java

Revert "Apply SettingsLib SeekBarPreference to Settings"

2021-06-08 09:47:51 +00:00

BubblePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BubbleSummaryPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

BubbleWarningDialogFragment.java

Bubble settings: feature, notification, app

2020-04-13 10:15:38 -07:00

ChannelListPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

ChannelNotificationSettings.java

Clean up notification settings

2021-06-18 14:36:20 -04:00

ChannelPanelActivity.java

Use shared model for non-system overlay toggle

2021-05-06 08:28:19 -07:00

ConversationDemotePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

ConversationHeaderPreferenceController.java

Fix potential NPE crash in ConversationHeaderPreferenceController

2022-09-09 10:16:29 +08:00

ConversationListPreferenceController.java

Fix Conversation page flickers

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

ConversationListSettings.java

Fix Conversation page flickers

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

ConversationNotificationSettings.java

Allow to block/unblock Conversation Notifications from Settings

2022-11-23 13:24:36 +00:00

ConversationPriorityPreference.java

Fix overlapping importance icons

2020-07-16 14:31:19 +00:00

ConversationPriorityPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

ConversationPromotePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

DeletedChannelsPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

DescriptionPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

DndPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

GlobalBubblePermissionObserverMixin.java

Change bubble settings to use Secure rather than Global

2021-04-20 01:37:34 +00:00

HeaderPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

HighImportancePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

ImportancePreference.java

…

ImportancePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

InvalidConversationInfoPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

InvalidConversationPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

LightsPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

MinImportancePreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

NoConversationsPreferenceController.java

Fix Conversation page flickers

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

NotificationPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

NotificationSettings.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

NotificationsOffPreferenceController.java

Fix text in notification settings for apps that do not send notifications

2022-10-27 20:19:44 +00:00

NotificationSoundPreference.java

…

PriorityConversationsPreferenceController.java

Fix Conversation page flickers

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

RecentConversationPreference.java

Change packagename of TwoTargetPreference

2021-02-13 12:17:14 +08:00

RecentConversationsPreferenceController.java

Fix Conversation page flickers

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

SoundPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

VibrationPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00

VisibilityPreferenceController.java

Revert^3 "Improve App notification loading"

2022-08-24 12:22:12 +00:00