Merge "Don't fade away clock when QS expands" (aa897c8f) · Commits · e / os / android_frameworks_base

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -205,7 +205,6 @@ public class NotificationPanelView extends PanelView implements
		private int mQsFalsingThreshold;

		private float mKeyguardStatusBarAnimateAlpha = 1f;
		private float mQsClockAlphaOverride = 1f;
		private int mOldLayoutDirection;
		private HeadsUpTouchHelper mHeadsUpTouchHelper;
		private boolean mIsExpansionFromHeadsUp;
		@@ -583,7 +582,7 @@ public class NotificationPanelView extends PanelView implements

		private void updateClock() {
		if (!mKeyguardStatusViewAnimating) {
		mKeyguardStatusView.setAlpha(mClockPositionResult.clockAlpha * mQsClockAlphaOverride);
		mKeyguardStatusView.setAlpha(mClockPositionResult.clockAlpha);
		}
		}

		@@ -1310,15 +1309,6 @@ public class NotificationPanelView extends PanelView implements
		mQsNavbarScrim.setAlpha(getQsExpansionFraction());
		}

		// Fade clock when QS is on top of it
		float newClockAlpha = (height - mKeyguardStatusView.getY()) /
		mKeyguardStatusView.getHeight();
		newClockAlpha = 1 - MathUtils.constrain(newClockAlpha, 0, 1);
		if (newClockAlpha != mQsClockAlphaOverride) {
		mQsClockAlphaOverride = Interpolators.ALPHA_OUT.getInterpolation(newClockAlpha);
		updateClock();
		}

		if (mAccessibilityManager.isEnabled()) {
		setAccessibilityPaneTitle(determineAccessibilityPaneTitle());
		}