Show clear all when returning from flip quick settings.

Bug: 7367906
Change-Id: I3c6d227d223f11c60a44ceee4cdf698aa2a0acc9

Author: dsandler

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)) {