am e663925: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev

* commit 'e663925f855ab4390a0e0bd3c9713ca948076ec1':
  Show clear all when returning from flip quick settings.

Author: Mike Cleron

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

@@ -1084,8 +1084,9 @@ protected void setAreThereNotifications() {
 
         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)) {