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

Commit b0f25159 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add placeholder on DND settings screen" into pi-dev

parents 77d1ca70 9aac3ce9

res/xml/zen_mode_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 
        android:title="@string/zen_mode_automation_settings_title"

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



    <!-- placeholder -->

    <PreferenceCategory

        android:key="dashboard_tile_placeholder"

        android:order="5" />



    <!-- Turn on DND button -->

    <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->

    <PreferenceCategory

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.language.LanguageAndInputSettings; 
import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.notification.ConfigureNotificationSettings;

import com.android.settings.notification.SoundSettings;

import com.android.settings.notification.ZenModeSettings;

import com.android.settings.security.LockscreenDashboardFragment;

import com.android.settings.security.SecuritySettings;

import com.android.settings.system.SystemDashboardFragment;
@@ -89,6 +90,8 @@ public class DashboardFragmentRegistry { 
                CategoryKey.CATEGORY_NOTIFICATIONS);

        PARENT_TO_CATEGORY_KEY_MAP.put(LockscreenDashboardFragment.class.getName(),

                CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);

        PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),

                CategoryKey.CATEGORY_DO_NOT_DISTURB);



        CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());