commit ff941af733a86c4b9fdf1f7f23ac6405faf73231
author John Spurlock <jspurlock@google.com> Wed Jul 23 01:43:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 22 22:02:49 2014 +0000
tree 256bc60c69d1383e3b5802612f1cf10000d03230
parent b763e34210e3947b46ef7c9bf396579f17ab0daf
parent de99ccf18b6f8810f2743b5b9fef513304d0ed4f

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

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

diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index c8befa0..c20b350 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -358,6 +358,7 @@
         }
         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 @@
         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 @@
                 mConfig = config;
                 if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
                 updateEndSummary();
+                updateStarredEnabled();
             }
             return success;
         } catch (Exception e) {