Merge "Fixes isAnyShadeFullyExpanded state being incorrect in HUN+occluded... (4dcec4af) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt

+10 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.systemui.keyguard.ui

		import android.os.Build
		import android.util.Log
		import android.view.animation.Interpolator
		import com.android.app.animation.Interpolators.LINEAR
		import com.android.keyguard.logging.KeyguardTransitionAnimationLogger
		@@ -131,6 +133,9 @@ constructor(
		onStart = {
		isShadeExpanded = shadeInteractor.get().isAnyFullyExpanded.value
		if (onStart != null) onStart()
		if (DEBUG_LOG) {
		Log.d(TAG, "onStart isShadeExpanded=$isShadeExpanded")
		}
		},
		onCancel =
		if (onCancel != null) {
		@@ -258,6 +263,11 @@ constructor(
		)
		}
		}

		private companion object {
		const val TAG = "KeyguardTransitionAnim"
		val DEBUG_LOG = Build.IS_DEBUGGABLE \|\| Log.isLoggable(TAG, Log.DEBUG)
		}
		}

		data class StateToValue(

+2 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.dagger.KeyguardStatusBarViewComponent;
		import com.android.systemui.DejankUtils;
		import com.android.systemui.Dumpable;
		import com.android.systemui.Flags;
		import com.android.systemui.Gefingerpoken;
		import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;
		import com.android.systemui.classifier.Classifier;
		@@ -1865,7 +1866,7 @@ public final class NotificationPanelViewController implements
		\|\| expandedHeight > mHeadsUpStartHeight);
		if (goingBetweenClosedShadeAndExpandedQs && qsShouldExpandWithHeadsUp) {
		float qsExpansionFraction;
		if (mSplitShadeEnabled) {
		if (mSplitShadeEnabled && !Flags.bouncerUiRevamp()) {
		qsExpansionFraction = 1;
		} else if (isKeyguardShowing()) {
		// On Keyguard, interpolate the QS expansion linearly to the panel expansion