diff options
| author | John Spurlock <jspurlock@google.com> | 2014-11-13 20:26:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 20:26:11 +0000 |
| commit | 1a68ba6b85473565de174f72beeb7734e49e0fa0 (patch) | |
| tree | d952ac9b068f536c63cf69f31541f59009f11a52 /packages | |
| parent | 3f8b53cc6282ba01bdb2b438ef6ce7a1f78792e2 (diff) | |
| parent | 338bc5a41854d40dfb35ec2865024d3b2737a864 (diff) | |
| download | frameworks_base-1a68ba6b85473565de174f72beeb7734e49e0fa0.zip frameworks_base-1a68ba6b85473565de174f72beeb7734e49e0fa0.tar.gz frameworks_base-1a68ba6b85473565de174f72beeb7734e49e0fa0.tar.bz2 | |
am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
* commit '338bc5a41854d40dfb35ec2865024d3b2737a864':
Zen: Update condition text for current condition.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 2 |
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(); |