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

Commit 7e117fba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reorganize notification Settings classes"

parents 79efb45f aceccce7

AndroidManifest.xml

+12 −12
Original line number Diff line number Diff line
@@ -745,13 +745,13 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.notification.ZenModeSettings" />

                android:value="com.android.settings.notification.zen.ZenModeSettings" />

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

                android:value="true" />

        </activity>



        <activity

            android:name=".notification.ZenSuggestionActivity"

            android:name=".notification.zen.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_suggestion_dnd"

            android:theme="@android:style/Theme.NoDisplay">
@@ -773,7 +773,7 @@ 
        </activity>



        <activity

            android:name=".notification.ZenOnboardingActivity"

            android:name=".notification.zen.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"

            android:icon="@drawable/ic_notifications"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
@@ -797,7 +797,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.notification.ZenModeAutomationSettings" />

                       android:value="com.android.settings.notification.zen.ZenModeAutomationSettings" />

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

                       android:value="true" />

        </activity>
@@ -860,7 +860,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />

                android:value="com.android.settings.notification.zen.ZenModeScheduleRuleSettings" />

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

                android:value="true" />

        </activity>
@@ -873,7 +873,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                android:value="com.android.settings.notification.ZenModeEventRuleSettings" />

                android:value="com.android.settings.notification.zen.ZenModeEventRuleSettings" />

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

                android:value="true" />

        </activity>
@@ -1169,10 +1169,10 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.notification.NotificationStation" />

                android:value="com.android.settings.notification.history.NotificationStation" />

        </activity>



        <activity android:name=".notification.ZenModeVoiceActivity"

        <activity android:name=".notification.zen.ZenModeVoiceActivity"

                android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                android:label="@string/zen_mode_settings_title">

            <intent-filter>
@@ -2434,7 +2434,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.notification.ZenAccessSettings" />

                       android:value="com.android.settings.notification.zen.ZenAccessSettings" />

        </activity>



        <activity
@@ -2463,7 +2463,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.notification.AppBubbleNotificationSettings" />

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

        </activity>



        <activity
@@ -2508,7 +2508,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                android:value="com.android.settings.notification.AppNotificationSettings" />

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

        </activity>



        <!-- Show channel-level notification settings (channel passed in as extras) -->
@@ -2520,7 +2520,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.notification.ChannelNotificationSettings" />

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

        </activity>



        <!-- Show Manual (from settings item) -->

res/xml/app_notification_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        android:key="block"

        android:layout="@layout/styled_switch_bar" />



    <com.android.settings.notification.NotificationFooterPreference

    <com.android.settings.notification.app.NotificationFooterPreference

        android:key="block_desc" />



    <!-- Channels/Channel groups added here -->
@@ -76,11 +76,11 @@ 


    </PreferenceCategory>



    <com.android.settings.notification.NotificationFooterPreference

    <com.android.settings.notification.app.NotificationFooterPreference

        android:key="desc"

        android:order="5000" />



    <com.android.settings.notification.NotificationFooterPreference

    <com.android.settings.notification.app.NotificationFooterPreference

        android:key="deleted"

        android:order="8000" />

res/xml/channel_notification_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:summary="@string/allow_interruption_summary" />



    <!-- Importance -->

    <com.android.settings.notification.ImportancePreference

    <com.android.settings.notification.app.ImportancePreference

        android:key="importance"

        android:order="4"

        android:title="@string/notification_importance_title"
@@ -64,7 +64,7 @@ 
        settings:initialExpandedChildrenCount="0">



        <!-- Default ringtone -->

        <com.android.settings.notification.NotificationSoundPreference

        <com.android.settings.notification.app.NotificationSoundPreference

            android:key="ringtone"

            android:title="@string/notification_channel_sound_title"

            android:dialogTitle="@string/notification_channel_sound_title"
@@ -121,11 +121,11 @@ 
            settings:allowDividerAbove="true"/>

    </PreferenceCategory>



    <com.android.settings.notification.NotificationFooterPreference

    <com.android.settings.notification.app.NotificationFooterPreference

        android:key="desc"

        android:order="100"/>



    <com.android.settings.notification.NotificationFooterPreference

    <com.android.settings.notification.app.NotificationFooterPreference

        android:key="block_desc"

        android:order="110"

        settings:allowDividerAbove="false"/>

res/xml/configure_notification_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ 
            android:key="zen_mode_notifications"

            android:title="@string/zen_mode_settings_title"

            settings:useAdminDisabledSummary="true"

            android:fragment="com.android.settings.notification.ZenModeSettings"

            settings:controller="com.android.settings.notification.ZenModePreferenceController"

            android:fragment="com.android.settings.notification.zen.ZenModeSettings"

            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"

            settings:allowDividerAbove="false"/>

    </PreferenceCategory>

</PreferenceScreen>

res/xml/sound_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -98,12 +98,12 @@ 
    <com.android.settingslib.RestrictedPreference

        android:key="zen_mode"

        android:title="@string/zen_mode_settings_title"

        android:fragment="com.android.settings.notification.ZenModeSettings"

        android:fragment="com.android.settings.notification.zen.ZenModeSettings"

        android:order="-120"

        settings:useAdminDisabledSummary="true"

        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.notification.ZenModePreferenceController"/>

        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>



    <Preference

        android:key="gesture_prevent_ringing_sound"