Fix clock translation on lockscreen (e1ff1eab) · Commits · e / os / android_frameworks_base

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

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ import android.widget.RelativeLayout;
	import androidx.annotation.IntDef;		import androidx.annotation.IntDef;
	import androidx.annotation.VisibleForTesting;		import androidx.annotation.VisibleForTesting;

			import com.android.keyguard.clock.DefaultClockController;
	import com.android.keyguard.dagger.KeyguardStatusViewScope;		import com.android.keyguard.dagger.KeyguardStatusViewScope;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.animation.Interpolators;		import com.android.systemui.animation.Interpolators;
	@@ -46,6 +47,9 @@ public class KeyguardClockSwitch extends RelativeLayout {

	public static final int LARGE = 0;		public static final int LARGE = 0;
	public static final int SMALL = 1;		public static final int SMALL = 1;
			// compensate for translation of parents subject to device screen
			// In this case, the translation comes from KeyguardStatusView
			public int screenOffsetYPadding = 0;

	/** Returns a region for the large clock to position itself, based on the given parent. */		/** Returns a region for the large clock to position itself, based on the given parent. */
	public static Rect getLargeClockRegion(ViewGroup parent) {		public static Rect getLargeClockRegion(ViewGroup parent) {
	@@ -161,8 +165,18 @@ public class KeyguardClockSwitch extends RelativeLayout {
	}		}

	if (mLargeClockFrame.isLaidOut()) {		if (mLargeClockFrame.isLaidOut()) {
			Rect targetRegion = getLargeClockRegion(mLargeClockFrame);
			if (mClock instanceof DefaultClockController) {
	mClock.getLargeClock().getEvents().onTargetRegionChanged(		mClock.getLargeClock().getEvents().onTargetRegionChanged(
	getLargeClockRegion(mLargeClockFrame));		targetRegion);
			} else {
			mClock.getLargeClock().getEvents().onTargetRegionChanged(
			new Rect(
			targetRegion.left,
			targetRegion.top - screenOffsetYPadding,
			targetRegion.right,
			targetRegion.bottom - screenOffsetYPadding));
			}
	}		}
	}		}
	}		}

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

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,14 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
	mOnlyClock = onlyClock;		mOnlyClock = onlyClock;
	}		}

			/**
			* Used for status view to pass the screen offset from parent view
			*/
			public void setLockscreenClockY(int clockY) {
			mView.screenOffsetYPadding = clockY;
			mView.updateClockTargetRegions();
			}

	/**		/**
	* Attach the controller to the view it relates to.		* Attach the controller to the view it relates to.
	*/		*/
	@@ -394,13 +402,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
	PropertyAnimator.setProperty(mStatusArea, AnimatableProperty.TRANSLATION_X,		PropertyAnimator.setProperty(mStatusArea, AnimatableProperty.TRANSLATION_X,
	x, props, animate);		x, props, animate);
	}		}

	}

	void updateKeyguardStatusViewOffset() {
	// updateClockTargetRegions will call onTargetRegionChanged
	// which will require the correct translationY property of keyguardStatusView after updating
	mView.updateClockTargetRegions();
	}		}

	/**		/**

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

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -214,6 +214,15 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
	return mKeyguardClockSwitchController.isClockTopAligned();		return mKeyguardClockSwitchController.isClockTopAligned();
	}		}

			/**
			* Pass top margin from ClockPositionAlgorithm in NotificationPanelViewController
			* Use for clock view in LS to compensate for top margin to align to the screen
			* Regardless of translation from AOD and unlock gestures
			*/
			public void setLockscreenClockY(int clockY) {
			mKeyguardClockSwitchController.setLockscreenClockY(clockY);
			}

	/**		/**
	* Set whether the view accessibility importance mode.		* Set whether the view accessibility importance mode.
	*/		*/
	@@ -230,7 +239,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
	* Update position of the view with an optional animation		* Update position of the view with an optional animation
	*/		*/
	public void updatePosition(int x, int y, float scale, boolean animate) {		public void updatePosition(int x, int y, float scale, boolean animate) {
	float oldY = mView.getY();
	setProperty(AnimatableProperty.Y, y, animate);		setProperty(AnimatableProperty.Y, y, animate);

	ClockController clock = mKeyguardClockSwitchController.getClock();		ClockController clock = mKeyguardClockSwitchController.getClock();
	@@ -246,10 +254,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
	setProperty(AnimatableProperty.SCALE_X, 1f, animate);		setProperty(AnimatableProperty.SCALE_X, 1f, animate);
	setProperty(AnimatableProperty.SCALE_Y, 1f, animate);		setProperty(AnimatableProperty.SCALE_Y, 1f, animate);
	}		}

	if (oldY != y) {
	mKeyguardClockSwitchController.updateKeyguardStatusViewOffset();
	}
	}		}

	/**		/**

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1513,6 +1513,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
	mKeyguardStatusViewController.getClockBottom(mStatusBarHeaderHeightKeyguard),		mKeyguardStatusViewController.getClockBottom(mStatusBarHeaderHeightKeyguard),
	mKeyguardStatusViewController.isClockTopAligned());		mKeyguardStatusViewController.isClockTopAligned());
	mClockPositionAlgorithm.run(mClockPositionResult);		mClockPositionAlgorithm.run(mClockPositionResult);
			mKeyguardStatusViewController.setLockscreenClockY(
			mClockPositionAlgorithm.getExpandedPreferredClockY());
	mKeyguardBottomAreaInteractor.setClockPosition(		mKeyguardBottomAreaInteractor.setClockPosition(
	mClockPositionResult.clockX, mClockPositionResult.clockY);		mClockPositionResult.clockX, mClockPositionResult.clockY);
	boolean animate = mNotificationStackScrollLayoutController.isAddOrRemoveAnimationPending();		boolean animate = mNotificationStackScrollLayoutController.isAddOrRemoveAnimationPending();

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -239,7 +239,11 @@ public class KeyguardClockPositionAlgorithm {
	}		}
	}		}

	private int getExpandedPreferredClockY() {		/**
			* give the static topMargin, used for lockscreen clocks to get the initial translationY
			* to do counter translation
			*/
			public int getExpandedPreferredClockY() {
	if (mIsSplitShade) {		if (mIsSplitShade) {
	return mSplitShadeTargetTopMargin;		return mSplitShadeTargetTopMargin;
	} else {		} else {