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

Commit 47047d4d authored by Beverly's avatar Beverly
Browse files

Show correct text for old zen modes 

When the device is in total silence or alarms only
dnd modes, DND settings for messages and calls should
say that no callers and no messages are allowed through.

Test: atest
Fixes: 130152926
Change-Id: I980dea46ef29e736ada41755bf0ea395c198f851
parent 96b53495

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()));

        }

    }

}