Merge "Fixed a bug where the scrim was distracting when pulling on HUN" (3660504f) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -188,9 +188,6 @@ public class PhoneStatusBarView extends PanelBar {
		public void panelScrimMinFractionChanged(float minFraction) {
		if (mMinFraction != minFraction) {
		mMinFraction = minFraction;
		if (minFraction != 0.0f) {
		mScrimController.animateNextChange();
		}
		updateScrimFraction();
		}
		}
		@@ -203,7 +200,11 @@ public class PhoneStatusBarView extends PanelBar {
		}

		private void updateScrimFraction() {
		float scrimFraction = Math.max(mPanelFraction, mMinFraction);
		float scrimFraction = mPanelFraction;
		if (mMinFraction < 1.0f) {
		scrimFraction = Math.max((mPanelFraction - mMinFraction) / (1.0f - mMinFraction),
		0);
		}
		mScrimController.setPanelExpansion(scrimFraction);
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -203,10 +203,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		scheduleUpdate();
		}

		public void animateNextChange() {
		mAnimateChange = true;
		}

		public void setDozing(boolean dozing) {
		if (mDozing != dozing) {
		mDozing = dozing;