commit d10f1e29d4d341e8a77fa9bec6e502ea688315b5
author Daniel Sandler <dsandler@android.com> Wed Oct 17 16:42:36 2012 -0400
committer The Android Automerger <android-build@android.com> Wed Oct 17 21:57:39 2012 -0700
tree 9b8a7f794e156fee2df57343244c986005d187d3
parent 737f4e736cfadac4554322749dbfd6031c1147a2

Show clear all when returning from flip quick settings.

Bug: 7367906
Change-Id: I3c6d227d223f11c60a44ceee4cdf698aa2a0acc9

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 5a9d12e..ee28c8c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1081,8 +1081,9 @@
 
         if (mHasFlipSettings 
                 && mFlipSettingsView != null 
-                && mFlipSettingsView.getVisibility() == View.VISIBLE) {
-            // the flip settings panel is showing; we should not be shown
+                && mFlipSettingsView.getVisibility() == View.VISIBLE
+                && mScrollView.getVisibility() != View.VISIBLE) {
+            // the flip settings panel is unequivocally showing; we should not be shown
             mClearButton.setVisibility(View.INVISIBLE);
         } else if (mClearButton.isShown()) {
             if (clearable != (mClearButton.getAlpha() == 1.0f)) {