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

Commit 6410746f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix customizer state" into rvc-dev am: 3aa99808 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099421

Change-Id: Id8bf958ab72dec185882d5944bd822ec20cc4f3b
parents 4020effc 3aa99808

packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java

+9 −0
Original line number Diff line number Diff line
@@ -104,4 +104,13 @@ public class QSDetailClipper { 
    public void showBackground() {

        mBackground.showSecondLayer();

    }



    /**

     * Cancels the animator if it's running.

     */

    public void cancelAnimator() {

        if (mAnimator != null) {

            mAnimator.cancel();

        }

    }

}

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+5 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene 
    public void showImmediately() {

        if (!isShown) {

            setVisibility(VISIBLE);

            mClipper.cancelAnimator();

            mClipper.showBackground();

            isShown = true;

            setTileSpecs();
@@ -230,6 +231,10 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene 
            mUiEventLogger.log(QSEditEvent.QS_EDIT_CLOSED);

            isShown = false;

            mToolbar.dismissPopupMenus();

            mClipper.cancelAnimator();

            // Make sure we're not opening (because we're closing). Nobody can think we are

            // customizing after the next two lines.

            mOpening = false;

            setCustomizing(false);

            save();

            if (animate) {