diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-11 18:36:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-10 21:21:20 +0000 |
| commit | e217145b69bb3b86fb15c80f05d4ea5dafd73eef (patch) | |
| tree | 2d0c44ed717c163d31847a1a0fdea1c72bb743a3 /packages/SystemUI | |
| parent | 722d9d9e0b4d6b644f1ba3c72193909f58b3feb9 (diff) | |
| parent | bc5858f4893558ae6fee24c14489be56e6c3f528 (diff) | |
| download | frameworks_base-e217145b69bb3b86fb15c80f05d4ea5dafd73eef.zip frameworks_base-e217145b69bb3b86fb15c80f05d4ea5dafd73eef.tar.gz frameworks_base-e217145b69bb3b86fb15c80f05d4ea5dafd73eef.tar.bz2 | |
Merge "Zen: Be more defensive against old time conditions."
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 6bb9765..9c166ac 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -215,10 +215,12 @@ public class ZenModePanel extends LinearLayout { } private void refreshExitConditionText() { + final String forever = mContext.getString(R.string.zen_mode_forever); if (mExitConditionId == null) { - mExitConditionText = mContext.getString(R.string.zen_mode_forever); + mExitConditionText = forever; } else if (ZenModeConfig.isValidCountdownConditionId(mExitConditionId)) { - mExitConditionText = parseExistingTimeCondition(mExitConditionId).summary; + final Condition condition = parseExistingTimeCondition(mExitConditionId); + mExitConditionText = condition != null ? condition.summary : forever; } else { mExitConditionText = "(until condition ends)"; // TODO persist current description } |