From 24791abae1737901e3d0a3f9f3e60b7aa31055fc Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Tue, 28 Oct 2014 11:25:37 -0400
Subject: [PATCH] Settings: Follow update to common conditions call.

Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
---
 .../settings/notification/ZenModeConditionSelection.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 856a7f6eb97..2f86f63a2bc 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -26,6 +26,7 @@ import android.os.ServiceManager;
 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 @@ public class ZenModeConditionSelection extends RadioGroup {
         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 @@ public class ZenModeConditionSelection extends RadioGroup {
             }
         }
         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);