Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a195b89 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c40 

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

Change-Id: I9ba9ec35fe40ec883c08622b075b2d56040fd1b7
parents 2a1b189c 613e3c40

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -2547,6 +2547,20 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$ConversationListSettingsActivity"

            android:label="@string/zen_mode_conversations_title"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.CONVERSATION_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.notification.app.ConversationListSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity

            android:name="Settings$AppBubbleNotificationSettingsActivity"

            android:label="@string/bubbles_app_toggle_title">

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ public class Settings extends SettingsActivity { 
    public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }

    public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ConversationListSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AppBubbleNotificationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class NotificationAssistantSettingsActivity extends SettingsActivity{ /* empty */ }

    public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ import com.android.settings.notification.SoundSettings; 
import com.android.settings.notification.app.AppBubbleNotificationSettings;

import com.android.settings.notification.app.AppNotificationSettings;

import com.android.settings.notification.app.ChannelNotificationSettings;

import com.android.settings.notification.app.ConversationListSettings;

import com.android.settings.notification.history.NotificationStation;

import com.android.settings.notification.zen.ZenAccessSettings;

import com.android.settings.notification.zen.ZenModeAutomationSettings;
@@ -243,6 +244,7 @@ public class SettingsGateway { 
            PhysicalKeyboardFragment.class.getName(),

            ZenModeSettings.class.getName(),

            SoundSettings.class.getName(),

            ConversationListSettings.class.getName(),

            ConfigureNotificationSettings.class.getName(),

            ChooseLockPassword.ChooseLockPasswordFragment.class.getName(),

            ChooseLockPattern.ChooseLockPatternFragment.class.getName(),