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

Commit 842d9406 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Avoid keyguard fling transition interrupt for timing issue" into main am: 2a4e99a7

parents 3aadebe4 2a4e99a7
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
    private int mDreamingToLockscreenTransitionTranslationY;
    private int mLockscreenToDreamingTransitionTranslationY;
    private int mGoneToDreamingTransitionTranslationY;
    private boolean mForceFlingAnimationForTest = false;
    private SplitShadeStateController mSplitShadeStateController;
    private final Runnable mFlingCollapseRunnable = () -> fling(0, false /* expand */,
            mNextCollapseSpeedUpFactor, false /* expandBecauseOfFalsing */);
@@ -2174,10 +2175,18 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
                }
            }
        });
        if (!mScrimController.isScreenOn() && !mForceFlingAnimationForTest) {
            animator.setDuration(1);
        }
        setAnimator(animator);
        animator.start();
    }

    @VisibleForTesting
    void setForceFlingAnimationForTest(boolean force) {
        mForceFlingAnimationForTest = force;
    }

    @VisibleForTesting
    void onFlingEnd(boolean cancelled) {
        mIsFlinging = false;
+4 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
        mScreenOn = false;
    }

    public boolean isScreenOn() {
        return mScreenOn;
    }

    public void setExpansionAffectsAlpha(boolean expansionAffectsAlpha) {
        mExpansionAffectsAlpha = expansionAffectsAlpha;
    }
+2 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo
    public void testOnTouchEvent_expansionResumesAfterBriefTouch() {
        mFalsingManager.setIsClassifierEnabled(true);
        mFalsingManager.setIsFalseTouch(false);
        mNotificationPanelViewController.setForceFlingAnimationForTest(true);
        // Start shade collapse with swipe up
        onTouchEvent(MotionEvent.obtain(0L /* downTime */,
                0L /* eventTime */, MotionEvent.ACTION_DOWN, 0f /* x */, 0f /* y */,
@@ -415,6 +416,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo
        // fling should still be called after a touch that does not exceed touch slop
        assertThat(mNotificationPanelViewController.isClosing()).isTrue();
        assertThat(mNotificationPanelViewController.isFlinging()).isTrue();
        mNotificationPanelViewController.setForceFlingAnimationForTest(false);
    }

    @Test