Merge "Fixed an issue where the qs position was wrong while bypassing" into sc-dev (2ce2914c) · Commits · e / os / android_frameworks_base

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -2574,8 +2574,8 @@ public class NotificationPanelViewController extends PanelViewController {
		// Small parallax as we pull down and clip QS
		startHeight = -mQsExpansionHeight * 0.2f;
		}
		if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()
		&& mNotificationStackScrollLayoutController.isPulseExpanding()) {
		if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()) {
		if (mNotificationStackScrollLayoutController.isPulseExpanding()) {
		if (!mPulseExpansionHandler.isExpanding()
		&& !mPulseExpansionHandler.getLeavingLockscreen()) {
		// If we aborted the expansion we need to make sure the header doesn't reappear
		@@ -2585,6 +2585,9 @@ public class NotificationPanelViewController extends PanelViewController {
		appearAmount = mNotificationStackScrollLayoutController
		.calculateAppearFractionBypass();
		}
		} else {
		appearAmount = 0.0f;
		}
		startHeight = -mQs.getQsMinExpansionHeight();
		}
		float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount));