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

Commit 1ad6e928 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Bouncer: Use Y coord delta instead of velocity." into tm-dev am: aa917e54 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198449

Change-Id: Iae1a193d349b63753dc84fb2b5b120c1526feed9
parents 688f27bb aa917e54

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -445,7 +445,7 @@ public abstract class PanelViewController { 
                mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_UNLOCK);

                mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_UNLOCK);

            }

            }

            @Classifier.InteractionType int interactionType = vel == 0 ? GENERIC

            @Classifier.InteractionType int interactionType = vel == 0 ? GENERIC

                    : vel > 0 ? QUICK_SETTINGS

                    : y - mInitialTouchY > 0 ? QUICK_SETTINGS

                            : (mKeyguardStateController.canDismissLockScreen()

                            : (mKeyguardStateController.canDismissLockScreen()

                                    ? UNLOCK : BOUNCER_UNLOCK);

                                    ? UNLOCK : BOUNCER_UNLOCK);
@@ -532,7 +532,7 @@ public abstract class PanelViewController { 
            return true;

            return true;

        }

        }





        @Classifier.InteractionType int interactionType = vel > 0

        @Classifier.InteractionType int interactionType = y - mInitialTouchY > 0

                ? QUICK_SETTINGS : (

                ? QUICK_SETTINGS : (

                        mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);

                        mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);