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

Commit f5dc0a19 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the... 

am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev

* commit '888322a6':
  animating challenge closed should close the challenge.
parents 267214f4 888322a6

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
    // Range: 0 (fully hidden) to 1 (fully visible)

    // Range: 0 (fully hidden) to 1 (fully visible)

    private float mChallengeOffset = 1.f;

    private float mChallengeOffset = 1.f;

    private boolean mChallengeShowing = true;

    private boolean mChallengeShowing = true;

    private boolean mChallengeShowingTargetState = true;

    private boolean mWasChallengeShowing = true;

    private boolean mWasChallengeShowing = true;

    private boolean mIsBouncing = false;

    private boolean mIsBouncing = false;
@@ -355,7 +356,8 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
    }

    }





    void completeChallengeScroll() {

    void completeChallengeScroll() {

        setChallengeShowing(mChallengeOffset != 0);

        setChallengeShowing(mChallengeShowingTargetState);

        mChallengeOffset = mChallengeShowing ? 1.f : 0.f;

        setScrollState(SCROLL_STATE_IDLE);

        setScrollState(SCROLL_STATE_IDLE);

        mChallengeInteractiveInternal = true;

        mChallengeInteractiveInternal = true;

        mChallengeView.setLayerType(LAYER_TYPE_NONE, null);

        mChallengeView.setLayerType(LAYER_TYPE_NONE, null);
@@ -1112,6 +1114,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        }

        }





        if (mHasLayout) {

        if (mHasLayout) {

            mChallengeShowingTargetState = show;

            final int layoutBottom = getLayoutBottom();

            final int layoutBottom = getLayoutBottom();

            animateChallengeTo(show ? layoutBottom :

            animateChallengeTo(show ? layoutBottom :

                    layoutBottom + mChallengeView.getHeight() - mChallengeBottomBound, velocity);

                    layoutBottom + mChallengeView.getHeight() - mChallengeBottomBound, velocity);