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

Commit 46b00f6b authored by Beverly Tai's avatar Beverly Tai Committed by android-build-merger
Browse files

Merge "Show correct text for old zen modes" into qt-dev am: 60eb96cd 

am: ece7d9b8

Change-Id: I06422941e7087f347b3ce917e004fc2c4063fc10
parents 1dae5a0c ece7d9b8

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

+13 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.settings.notification;



import android.app.NotificationManager;

import android.content.Context;

import android.provider.Settings;



import androidx.preference.Preference;
@@ -50,6 +52,16 @@ public class ZenModeCallsPreferenceController extends 
    public void updateState(Preference preference) {

        super.updateState(preference);



        switch (getZenMode()) {

            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:

            case Settings.Global.ZEN_MODE_ALARMS:

                preference.setEnabled(false);

                preference.setSummary(mBackend.getAlarmsTotalSilenceCallsMessagesSummary(

                        NotificationManager.Policy.PRIORITY_CATEGORY_CALLS));

                break;

            default:

                preference.setEnabled(true);

                preference.setSummary(mSummaryBuilder.getCallsSettingSummary(getPolicy()));

        }

    }

}

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

+13 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.settings.notification;



import android.app.NotificationManager;

import android.content.Context;

import android.provider.Settings;



import androidx.preference.Preference;
@@ -49,6 +51,16 @@ public class ZenModeMessagesPreferenceController extends 
    public void updateState(Preference preference) {

        super.updateState(preference);



        switch (getZenMode()) {

            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:

            case Settings.Global.ZEN_MODE_ALARMS:

                preference.setEnabled(false);

                preference.setSummary(mBackend.getAlarmsTotalSilenceCallsMessagesSummary(

                        NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES));

                break;

            default:

                preference.setEnabled(true);

                preference.setSummary(mSummaryBuilder.getMessagesSettingSummary(getPolicy()));

        }

    }

}