Merge "Fix qs translation on split shade lock screen" into sc-v2-dev (b90a1742) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2376,7 +2376,7 @@ public class NotificationPanelViewController extends PanelViewController {
		// qsTranslation should only be positive during pulse expansion because it's
		// already translating in from the top
		qsTranslation = Math.max(0, (top - mQs.getHeader().getHeight()) / 2.0f);
		} else {
		} else if (!mShouldUseSplitNotificationShade) {
		qsTranslation = (top - mQs.getHeader().getHeight()) * QS_PARALLAX_AMOUNT;
		}
		}