Merge "Update clock position" into tm-dev (404e0450) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,18 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
		mStatusBarStateController.removeCallback(mStatusBarStateListener);
		}

		/**
		* @return the number of pixels below the baseline. For fonts that support languages such as
		* Burmese, this space can be significant.
		*/
		public float getBottom() {
		if (mView.getPaint() != null && mView.getPaint().getFontMetrics() != null) {
		return mView.getPaint().getFontMetrics().bottom;
		}

		return 0f;
		}

		/** Animate the clock appearance */
		public void animateAppear() {
		if (!mIsDozing) mView.animateAppearOnLockscreen();

+2 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS

		private void updateClockLayout() {
		int largeClockTopMargin = getContext().getResources().getDimensionPixelSize(
		R.dimen.keyguard_large_clock_top_margin);

		R.dimen.keyguard_large_clock_top_margin)
		- (int) mLargeClockViewController.getBottom();
		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT,
		MATCH_PARENT);
		lp.topMargin = largeClockTopMargin;