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

Commit ab2e9c7c authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 1aa2876c: am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication... 

am 1aa2876c: am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev

* commit '1aa2876c':
  Fixed a bug where the indication text could get too high
parents a275184b 1aa2876c

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

+2 −4
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ public abstract class PanelView extends FrameLayout { 
    protected int mTouchSlop;

    protected boolean mHintAnimationRunning;

    private boolean mOverExpandedBeforeFling;

    private float mOriginalIndicationY;

    private boolean mTouchAboveFalsingThreshold;

    private int mUnlockFalsingThreshold;
@@ -841,16 +840,15 @@ public abstract class PanelView extends FrameLayout { 
        });

        animator.start();

        mHeightAnimator = animator;

        mOriginalIndicationY = mKeyguardBottomArea.getIndicationView().getY();

        mKeyguardBottomArea.getIndicationView().animate()

                .y(mOriginalIndicationY - mHintDistance)

                .translationY(-mHintDistance)

                .setDuration(250)

                .setInterpolator(mFastOutSlowInInterpolator)

                .withEndAction(new Runnable() {

                    @Override

                    public void run() {

                        mKeyguardBottomArea.getIndicationView().animate()

                                .y(mOriginalIndicationY)

                                .translationY(0)

                                .setDuration(450)

                                .setInterpolator(mBounceInterpolator)

                                .start();