PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show correct text for old zen modes" into qt-dev

Browse Source
This commit is contained in:
Beverly Tai
2019-04-19 13:17:20 +00:00
committed by Android (Google) Code Review
parent fb250122f8 47047d4df8
commit 60eb96cd29
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/notification/ZenModeCallsPreferenceController.java
View File

@@ -16,7 +16,9 @@
package com.android.settings.notification; package com.android.settings.notification;
import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -50,6 +52,16 @@ public class ZenModeCallsPreferenceController extends
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
preference.setSummary(mSummaryBuilder.getCallsSettingSummary(getPolicy())); 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()));
}
} }
} }

14
src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
View File

@@ -16,7 +16,9 @@
package com.android.settings.notification; package com.android.settings.notification;
import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -49,6 +51,16 @@ public class ZenModeMessagesPreferenceController extends
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
preference.setSummary(mSummaryBuilder.getMessagesSettingSummary(getPolicy())); 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()));
}
} }
} }