Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev (6d4917b6) · Commits · e / os / android_frameworks_base

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

+13 −5

Original line number	Original line	Diff line number	Diff line
	@@ -212,7 +212,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
	}		}

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

	public void showClock(boolean animate) {		public void showClock(boolean animate) {
	@@ -240,21 +240,29 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
	}		}

	/**		/**
	* Hides a view.		* Animate a view to INVISIBLE or GONE
	*/		*/
	private void animateHide(final View v, boolean animate) {		private void animateHiddenState(final View v, int state, boolean animate) {
	v.animate().cancel();		v.animate().cancel();
	if (!animate) {		if (!animate) {
	v.setAlpha(0f);		v.setAlpha(0f);
	v.setVisibility(View.INVISIBLE);		v.setVisibility(state);
	return;		return;
	}		}

	v.animate()		v.animate()
	.alpha(0f)		.alpha(0f)
	.setDuration(160)		.setDuration(160)
	.setStartDelay(0)		.setStartDelay(0)
	.setInterpolator(Interpolators.ALPHA_OUT)		.setInterpolator(Interpolators.ALPHA_OUT)
	.withEndAction(() -> v.setVisibility(View.INVISIBLE));		.withEndAction(() -> v.setVisibility(state));
			}

			/**
			* Hides a view.
			*/
			private void animateHide(final View v, boolean animate) {
			animateHiddenState(v, View.INVISIBLE, animate);
	}		}

	/**		/**

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -121,7 +121,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest {
	fragment.initNotificationIconArea(mMockNotificiationAreaController);		fragment.initNotificationIconArea(mMockNotificiationAreaController);
	fragment.disable(StatusBarManager.DISABLE_CLOCK, 0, false);		fragment.disable(StatusBarManager.DISABLE_CLOCK, 0, false);

	assertEquals(View.INVISIBLE, mFragment.getView().findViewById(R.id.clock).getVisibility());		assertEquals(View.GONE, mFragment.getView().findViewById(R.id.clock).getVisibility());

	fragment.disable(0, 0, false);		fragment.disable(0, 0, false);