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

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

am e2b6a935: am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge... 

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

* commit 'e2b6a935':
  animating challenge closed should close the challenge.
parents c05ad9a2 e2b6a935

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

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

    private float mChallengeOffset = 1.f;

    private boolean mChallengeShowing = true;

    private boolean mChallengeShowingTargetState = true;

    private boolean mWasChallengeShowing = true;

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



    void completeChallengeScroll() {

        setChallengeShowing(mChallengeOffset != 0);

        setChallengeShowing(mChallengeShowingTargetState);

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

        setScrollState(SCROLL_STATE_IDLE);

        mChallengeInteractiveInternal = true;

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



        if (mHasLayout) {

            mChallengeShowingTargetState = show;

            final int layoutBottom = getLayoutBottom();

            animateChallengeTo(show ? layoutBottom :

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