Merge "Revert "Now Playing is too low on the lock screen"" into tm-qpr-dev (91d98245) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@
		<dimen name="keyguard_lock_padding">20dp</dimen>

		<dimen name="keyguard_indication_margin_bottom">32dp</dimen>
		<dimen name="lock_icon_margin_bottom">74dp</dimen>
		<dimen name="lock_icon_margin_bottom">110dp</dimen>
		<dimen name="ambient_indication_margin_bottom">71dp</dimen>

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -158,10 +158,6 @@ public class LockIconView extends FrameLayout implements Dumpable {
		return mLockIconCenter.y - mRadius;
		}

		float getLocationBottom() {
		return mLockIconCenter.y + mRadius;
		}

		/**
		* Updates the icon its default state where no visual is shown.
		*/

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -280,10 +280,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
		return mView.getLocationTop();
		}

		public float getBottom() {
		return mView.getLocationBottom();
		}

		private void updateVisibility() {
		if (mCancelDelayedUpdateVisibilityRunnable != null) {
		mCancelDelayedUpdateVisibilityRunnable.run();

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+5 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.keyguard.data.repository

		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging
		import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
		import com.android.systemui.common.shared.model.Position
		@@ -124,11 +123,6 @@ interface KeyguardRepository {
		* Sets the relative offset of the lock-screen clock from its natural position on the screen.
		*/
		fun setClockPosition(x: Int, y: Int)

		/**
		* Returns whether the keyguard bottom area should be constrained to the top of the lock icon
		*/
		fun isUdfpsSupported(): Boolean
		}

		/** Encapsulates application state for the keyguard. */
		@@ -137,11 +131,10 @@ class KeyguardRepositoryImpl
		@Inject
		constructor(
		statusBarStateController: StatusBarStateController,
		private val keyguardStateController: KeyguardStateController,
		dozeHost: DozeHost,
		wakefulnessLifecycle: WakefulnessLifecycle,
		biometricUnlockController: BiometricUnlockController,
		private val keyguardStateController: KeyguardStateController,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		) : KeyguardRepository {
		private val _animateBottomAreaDozingTransitions = MutableStateFlow(false)
		override val animateBottomAreaDozingTransitions =
		@@ -318,8 +311,6 @@ constructor(
		_clockPosition.value = Position(x, y)
		}

		override fun isUdfpsSupported(): Boolean = keyguardUpdateMonitor.isUdfpsSupported

		private fun statusBarStateIntToObject(value: Int): StatusBarState {
		return when (value) {
		0 -> StatusBarState.SHADE

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBottomAreaInteractor.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -48,9 +48,4 @@ constructor(
		fun setAnimateDozingTransitions(animate: Boolean) {
		repository.setAnimateDozingTransitions(animate)
		}

		/**
		* Returns whether the keyguard bottom area should be constrained to the top of the lock icon
		*/
		fun shouldConstrainToTopOfLockIcon(): Boolean = repository.isUdfpsSupported()
		}