diff options
| -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 80a14b3511f3..1cab7ea426bf 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 1000352f6933..798e7fa43228 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) { |