Merge "Don't always set the clock to View.GONE" into pi-dev (b3f8cd7d) · Commits · e / os / android_frameworks_base

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

+15 −2

Original line number	Diff line number	Diff line
		@@ -165,7 +165,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		showNotificationIconArea(animate);
		}
		}
		if ((diff1 & DISABLE_CLOCK) != 0) {
		// The clock may have already been hidden, but we might want to shift its
		// visibility to GONE from INVISIBLE or vice versa
		if ((diff1 & DISABLE_CLOCK) != 0 \|\| mClockView.getVisibility() != clockHiddenMode()) {
		if ((state1 & DISABLE_CLOCK) != 0) {
		hideClock(animate);
		} else {
		@@ -212,13 +214,24 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		}

		public void hideClock(boolean animate) {
		animateHiddenState(mClockView, View.GONE, animate);
		animateHiddenState(mClockView, clockHiddenMode(), animate);
		}

		public void showClock(boolean animate) {
		animateShow(mClockView, animate);
		}

		/**
		* If panel is expanded/expanding it usually means QS shade is opening, so
		* don't set the clock GONE otherwise it'll mess up the animation.
		*/
		private int clockHiddenMode() {
		if (!mStatusBar.isClosed() && !mKeyguardMonitor.isShowing()) {
		return View.INVISIBLE;
		}
		return View.GONE;
		}

		public void hideNotificationIconArea(boolean animate) {
		animateHide(mNotificationIconAreaInner, animate);
		}