Merge "Merge "Bouncer: Use Y coord delta instead of velocity." into tm-dev am: aa917e543e" (c50f11c4) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ public abstract class PanelViewController {
		mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_UNLOCK);
		}
		@Classifier.InteractionType int interactionType = vel == 0 ? GENERIC
		: vel > 0 ? QUICK_SETTINGS
		: y - mInitialTouchY > 0 ? QUICK_SETTINGS
		: (mKeyguardStateController.canDismissLockScreen()
		? UNLOCK : BOUNCER_UNLOCK);

		@@ -532,7 +532,7 @@ public abstract class PanelViewController {
		return true;
		}

		@Classifier.InteractionType int interactionType = vel > 0
		@Classifier.InteractionType int interactionType = y - mInitialTouchY > 0
		? QUICK_SETTINGS : (
		mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);