Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev

This commit is contained in:
John Spurlock
2014-07-23 01:43:37 +00:00
committed by Android (Google) Code Review

View File

@@ -358,6 +358,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
}
mMessages.setChecked(mConfig.allowMessages);
mStarred.setSelectedValue(mConfig.allowFrom);
updateStarredEnabled();
updateDays();
mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
@@ -366,6 +367,10 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
updateEndSummary();
}
private void updateStarredEnabled() {
mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
}
private void refreshAutomationSection() {
if (mConditionProviders != null) {
final int total = ConditionProviderSettings.getProviderCount(mPM);
@@ -453,6 +458,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
mConfig = config;
if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
updateEndSummary();
updateStarredEnabled();
}
return success;
} catch (Exception e) {