diff options
author | John Spurlock <jspurlock@google.com> | 2014-06-05 20:46:01 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2014-06-05 20:55:49 -0400 |
commit | 2769ac290784d2057f44589aeae5140102b21af3 (patch) | |
tree | 3db5ff89c2b4a19e280ed8fbf9fa5e6bf4f07bb5 /packages/SystemUI/src/com/android/systemui/volume | |
parent | 8089ce7cbc6ddae54c7a9623fd2692704d0bcdb2 (diff) | |
download | frameworks_base-2769ac290784d2057f44589aeae5140102b21af3.zip frameworks_base-2769ac290784d2057f44589aeae5140102b21af3.tar.gz frameworks_base-2769ac290784d2057f44589aeae5140102b21af3.tar.bz2 |
VolumeZen: Only display active condition when entering.
Instead of always displaying the active condition, only
show it the first time (when turning zen on).
Bug:15455271
Change-Id: I89e8e2c09fa0d06a5e4c3174f825dfe5a452f06e
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java | 9 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 80a14b3..1cab7ea 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -333,6 +333,7 @@ public class VolumePanel extends Handler { public void onDismiss(DialogInterface dialog) { mActiveStreamType = -1; mAudioManager.forceVolumeControlStream(mActiveStreamType); + collapse(); } }); @@ -651,12 +652,8 @@ public class VolumePanel extends Handler { mExpandDivider.setVisibility(show ? View.VISIBLE : View.GONE); mExpandButton.setImageResource(zen ? com.android.systemui.R.drawable.ic_vol_zen_on : com.android.systemui.R.drawable.ic_vol_zen_off); - if (show) { - if (zen) { - expand(); - } else { - collapse(); - } + if (show && !zen) { + collapse(); } } else { mExpandButton.setVisibility(View.GONE); diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 1000352..798e7fa 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -323,10 +323,6 @@ public class ZenModePanel extends LinearLayout { button1.setVisibility(View.GONE); button2.setVisibility(View.GONE); } - if (mExitConditionId != null && mExitConditionId.equals(tag.conditionId)) { - if (DEBUG) Log.d(mTag, "Auto-selecting row with mExitConditionId=" + mExitConditionId); - tag.rb.setChecked(true); - } } private void onClickTimeButton(View row, ConditionTag tag, boolean up) { |