PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing conversation field" into udc-dev am: 2494fd0187 am: f448aec29d

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

Change-Id: I2832cdad7f91b61abca77691f2fbaa183b47c153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2023-03-20 23:22:32 +00:00
committed by Automerger Merge Worker
parent b908fbe306 f448aec29d
commit 0ff921e245
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/conversation_notification_settings.xml
View File

@@ -96,4 +96,11 @@
android:summary="@string/demote_conversation_summary" android:summary="@string/demote_conversation_summary"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"/>
<!-- only used in ChannelPanelActivity -->
<Preference
android:key="convo_promote"
android:icon="@drawable/ic_promote_conversation"
android:title="@string/promote_conversation_title"
android:summary="@string/promote_conversation_summary" />
</PreferenceScreen> </PreferenceScreen>

1
src/com/android/settings/notification/app/ConversationNotificationSettings.java
View File

@@ -99,6 +99,7 @@ public class ConversationNotificationSettings extends NotificationSettings {
mControllers.add(new BubblePreferenceController(context, getChildFragmentManager(), mControllers.add(new BubblePreferenceController(context, getChildFragmentManager(),
mBackend, false /* isAppPage */, null /* dependentFieldListener */)); mBackend, false /* isAppPage */, null /* dependentFieldListener */));
mControllers.add(new ConversationDemotePreferenceController(context, this, mBackend)); mControllers.add(new ConversationDemotePreferenceController(context, this, mBackend));
mControllers.add(new ConversationPromotePreferenceController(context, this, mBackend));
mControllers.add(new BubbleCategoryPreferenceController(context)); mControllers.add(new BubbleCategoryPreferenceController(context));
mControllers.add(new BubbleLinkPreferenceController(context)); mControllers.add(new BubbleLinkPreferenceController(context));
return new ArrayList<>(mControllers); return new ArrayList<>(mControllers);