summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/volume
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-12 09:16:49 -0500
committerJohn Spurlock <jspurlock@google.com>2014-11-13 11:03:10 -0500
commit25c3421c5e65ddc7f2b2bf1b1208f3634e6f5256 (patch)
tree0eba07e7e829437f5843e3059da83ca1e896c4b7 /packages/SystemUI/src/com/android/systemui/volume
parentf030e66f9d8b931bf58cb36ae3a0e72c9a487d96 (diff)
downloadframeworks_base-25c3421c5e65ddc7f2b2bf1b1208f3634e6f5256.zip
frameworks_base-25c3421c5e65ddc7f2b2bf1b1208f3634e6f5256.tar.gz
frameworks_base-25c3421c5e65ddc7f2b2bf1b1208f3634e6f5256.tar.bz2
Zen: Update condition text for current condition.
If the provider sends us an updated summary (or other text) for the currently selected exit condition, update the UI and persisted condition. Update the downtime condition text (end time/line2 + summary) when the next alarm changes (if downtime = none). Also, clear the fired-alarm cache on time or time-zone resets. Bug: 16373455 Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index b325653..ed6ddd2 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -244,7 +244,7 @@ public class ZenModePanel extends LinearLayout {
}
private void setExitCondition(Condition exitCondition) {
- if (sameConditionId(mExitCondition, exitCondition)) return;
+ if (Objects.equals(mExitCondition, exitCondition)) return;
mExitCondition = exitCondition;
refreshExitConditionText();
updateWidgets();