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

Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54

Browse Source 
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
This commit is contained in:
TreeHugger Robot
2020-05-16 00:06:05 +00:00
committed by Automerger Merge Worker
parent 32d189fbfe e8d332dc54
commit 07c525c487
5 changed files with 150 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/app_and_notification.xml
View File

@@ -46,6 +46,14 @@
android:layout="@layout/preference_category_no_label"
android:order="-997"/>
<Preference
android:key="conversations"
android:title="@string/conversations_category_title"
android:order="-550"
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
android:fragment="com.android.settings.notification.app.ConversationListSettings"
/>
<Preference
android:key="configure_notification_settings"
android:title="@string/configure_notification_settings"

8
res/xml/configure_notification_settings.xml
View File

@@ -38,14 +38,6 @@
android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
</Preference>
<Preference
android:key="conversations"
android:title="@string/conversations_category_title"
android:summary="@string/manage_conversations"
android:order="3"
android:fragment="com.android.settings.notification.app.ConversationListSettings"
/>
<Preference
android:key="notification_bubbles"
android:title="@string/notification_bubbles_title"