commit 90674e53fc1fbac31f112fd6f11a5365cf66ec42
author John Spurlock <jspurlock@google.com> Tue Oct 28 17:08:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 28 17:08:51 2014 +0000
tree 0af93c361cf62546d045cc19fe11dd4091210515
parent 9f0bab9bcb756607da99758971207ad833c4608b
parent 24791abae1737901e3d0a3f9f3e60b7aa31055fc

Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev

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

diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 856a7f6..2f86f63 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -26,6 +26,7 @@
 import android.service.notification.Condition;
 import android.service.notification.IConditionListener;
 import android.service.notification.ZenModeConfig;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
@@ -59,7 +60,8 @@
         b.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));
         b.setChecked(true);
         for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {
-            handleCondition(ZenModeConfig.toTimeCondition(ZenModeConfig.MINUTE_BUCKETS[i]));
+            handleCondition(ZenModeConfig.toTimeCondition(mContext,
+                    ZenModeConfig.MINUTE_BUCKETS[i]));
         }
     }
 
@@ -114,7 +116,7 @@
             }
         }
         if (v != null) {
-            v.setText(c.summary);
+            v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);
             v.setEnabled(c.state == Condition.STATE_TRUE);
         }
         mConditions.add(c);