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

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

am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce."... 

am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev

* commit '950f947c':
  make challengeShowing sticky across bounce.
parents ac20bfe1 950f947c

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

+4 −2
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 mWasChallengeShowing = true;

    private boolean mIsBouncing = false;



    private final Scroller mScroller;
@@ -467,8 +468,9 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
    @Override

    public void showBouncer() {

        if (mIsBouncing) return;

        mIsBouncing = true;

        mWasChallengeShowing = mChallengeShowing;

        showChallenge(true);

        mIsBouncing = true;

        if (mScrimView != null) {

            mScrimView.setVisibility(VISIBLE);

        }
@@ -491,7 +493,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
    @Override

    public void hideBouncer() {

        if (!mIsBouncing) return;

        showChallenge(false);

        if (!mWasChallengeShowing) showChallenge(false);

        mIsBouncing = false;

        if (mScrimView != null) {

            mScrimView.setVisibility(GONE);