Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37419507 authored by Mike Cleron's avatar Mike Cleron Committed by Android Git Automerger
Browse files

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

* commit 'e663925f':
  Show clear all when returning from flip quick settings.
parents c389ca61 e663925f

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

+3 −2
Original line number Diff line number Diff line
@@ -1084,8 +1084,9 @@ public class PhoneStatusBar extends BaseStatusBar { 


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