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

Commit 7cdc5186 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Notification settings update." into oc-dev 

am: e5493808

Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
parents dd3945ec e5493808

res/xml/upgraded_channel_notification_settings.xml

+21 −15
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
        android:title="@string/notification_vibrate_title"

        settings:useAdditionalSummary="true" />



    <PreferenceCategory

        android:title="@string/advanced_apps">



        <!-- Show badge -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="badge"
@@ -61,4 +64,7 @@ 
            android:title="@string/app_notification_override_dnd_title"

            android:summary="@string/app_notification_override_dnd_summary"

            settings:useAdditionalSummary="true" />



    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/notification/AppNotificationSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -339,15 +339,15 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            case NotificationManager.IMPORTANCE_NONE:

                return getContext().getString(R.string.notification_toggle_off);

            case NotificationManager.IMPORTANCE_MIN:

                return getContext().getString(R.string.notification_importance_min_title);

                return getContext().getString(R.string.notification_importance_min);

            case NotificationManager.IMPORTANCE_LOW:

                return getContext().getString(R.string.notification_importance_low_title);

                return getContext().getString(R.string.notification_importance_low);

            case NotificationManager.IMPORTANCE_DEFAULT:

                return getContext().getString(R.string.notification_importance_default_title);

                return getContext().getString(R.string.notification_importance_default);

            case NotificationManager.IMPORTANCE_HIGH:

            case NotificationManager.IMPORTANCE_MAX:

            default:

                return getContext().getString(R.string.notification_importance_high_title);

                return getContext().getString(R.string.notification_importance_high);

        }



    }