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

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

Merge "Consolidate notification settings." into oc-dev

parents ceedf2b9 8cf8bf0a

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2519,7 +2519,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"
@@ -2582,7 +2582,7 @@ 
                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                       android:value="com.android.settings.category.ia.apps" />

                       android:value="com.android.settings.category.ia.notifications" />

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

                android:value="com.android.settings.applications.NotificationApps" />

        </activity>

res/xml/configure_notification_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 
                  android:title="@string/configure_notification_settings"

                  android:key="configure_notification_settings">



    <PreferenceCategory

        android:key="dashboard_tile_placeholder"

        android:order="1"/>



    <!-- Pulse notification light -->

    <SwitchPreference

        android:key="notification_pulse"

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settings.deviceinfo.StorageDashboardFragment; 
import com.android.settings.fuelgauge.PowerUsageSummary;

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.system.SystemDashboardFragment;

import com.android.settingslib.drawer.CategoryKey;
@@ -83,6 +84,8 @@ public class DashboardFragmentRegistry { 
                CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

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

                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

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

                CategoryKey.CATEGORY_NOTIFICATIONS);



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