Merge "Hide the notification tray carrier label during and not after flip animation" into cm-11.0 (f6a5f2d6) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -299,6 +299,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		private boolean mRecreating = false;

		private boolean mBrightnessControl;
		private boolean mAnimatingFlip = false;
		private float mScreenWidth;
		private int mMinBrightness;
		private int mPeekHeight;
		@@ -1305,7 +1306,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		final boolean makeVisible =
		!(emergencyCallsShownElsewhere && mNetworkController.isEmergencyOnly())
		&& mPile.getHeight() < (mNotificationPanel.getHeight() - mCarrierLabelHeight - mNotificationHeaderHeight)
		&& mScrollView.getVisibility() == View.VISIBLE;
		&& mScrollView.getVisibility() == View.VISIBLE
		&& !mAnimatingFlip;

		if (force \|\| mCarrierLabelVisible != makeVisible) {
		mCarrierLabelVisible = makeVisible;
		@@ -1748,6 +1750,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mFlipSettingsView.setScaleX(1f);
		}

		mAnimatingFlip = true;
		mScrollView.setVisibility(View.VISIBLE);
		mScrollViewAnim = start(
		startDelay(FLIP_DURATION_OUT * zeroOutDelays,
		@@ -1785,6 +1788,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		setAreThereNotifications(); // this will show/hide the button as necessary
		mNotificationPanel.postDelayed(new Runnable() {
		public void run() {
		mAnimatingFlip = false;
		updateCarrierLabelVisibility(false);
		}
		}, FLIP_DURATION - 150);
		@@ -1878,6 +1882,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mNotificationButton.setAlpha(progress);
		}
		mClearButton.setVisibility(View.GONE);

		mAnimatingFlip = true;
		updateCarrierLabelVisibility(false);
		}

		public void flipToSettings() {
		@@ -1903,6 +1910,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		mFlipSettingsView.setVisibility(View.VISIBLE);
		mAnimatingFlip = true;
		mFlipSettingsViewAnim = start(
		startDelay(FLIP_DURATION_OUT * zeroOutDelays,
		interpolator(mDecelerateInterpolator,
		@@ -1941,9 +1949,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mClearButton, View.INVISIBLE));
		mNotificationPanel.postDelayed(new Runnable() {
		public void run() {
		updateCarrierLabelVisibility(false);
		mAnimatingFlip = false;
		}
		}, FLIP_DURATION - 150);
		updateCarrierLabelVisibility(false);
		}

		public void flipPanels() {