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

Commit 2c406375 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "End current key button animations when the button is hidden" into rvc-qpr-dev am: 19893112 

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

Change-Id: Idbce346cc33731b1682bcdb511b1532a897c8e67
parents 0ebdca74 19893112

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java

+18 −0
Original line number Diff line number Diff line
@@ -171,6 +171,24 @@ public class KeyButtonDrawable extends Drawable { 
        }

    }



    @Override

    public boolean setVisible(boolean visible, boolean restart) {

        boolean changed = super.setVisible(visible, restart);

        if (changed) {

            // End any existing animations when the visibility changes

            jumpToCurrentState();

        }

        return changed;

    }



    @Override

    public void jumpToCurrentState() {

        super.jumpToCurrentState();

        if (mAnimatedDrawable != null) {

            mAnimatedDrawable.jumpToCurrentState();

        }

    }



    @Override

    public void setAlpha(int alpha) {

        mState.mAlpha = alpha;

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java

+10 −0
Original line number Diff line number Diff line
@@ -224,6 +224,16 @@ public class KeyButtonRipple extends Drawable { 
        }

    }



    @Override

    public boolean setVisible(boolean visible, boolean restart) {

        boolean changed = super.setVisible(visible, restart);

        if (changed) {

            // End any existing animations when the visibility changes

            jumpToCurrentState();

        }

        return changed;

    }



    @Override

    public void jumpToCurrentState() {

        endAnimations("jumpToCurrentState", false /* cancel */);