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

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

Browse Source
This commit is contained in:
John Spurlock
2014-10-28 17:08:50 +00:00
committed by Android (Google) Code Review
parent 9f0bab9bcb 24791abae1
commit 90674e53fc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/ZenModeConditionSelection.java
View File

@@ -26,6 +26,7 @@ import android.os.ServiceManager;
import android.service.notification.Condition; import android.service.notification.Condition;
import android.service.notification.IConditionListener; import android.service.notification.IConditionListener;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.RadioButton; 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.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));
b.setChecked(true); b.setChecked(true);
for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) { 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) { if (v != null) {
v.setText(c.summary); v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);
v.setEnabled(c.state == Condition.STATE_TRUE); v.setEnabled(c.state == Condition.STATE_TRUE);
} }
mConditions.add(c); mConditions.add(c);