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

Commit 03ad0c09 authored by Chris Wren's avatar Chris Wren
Browse files

make challengeShowing sticky across bounce.

Bug: 7482335
Change-Id: I94811c778c66c78655988f7ff6e4c6d59dac831d
Proto-Id: I3e10968c2a627ac392f39ffc3a6ae5fb33f78117
parent 50bf5458
Loading
Loading
Loading
Loading
+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);