Snap for 13310998 from 68b218bbf3db478a3791e7099848271390a6985f to 25Q3-release (6895c5ec) · Commits · e / os / android_frameworks_libs_systemui

PREUPLOAD.cfg

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,5 +11,7 @@ checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPL

		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}

		alint_hook = ${REPO_ROOT}/vendor/google/tools/alint

		[Tool Paths]
		ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

mechanics/src/com/android/mechanics/MotionValue.kt

+18 −16

Original line number	Diff line number	Diff line
		@@ -376,7 +376,8 @@ private class ObservableComputations(
		directMappedVelocity = 0f
		}

		var scheduleNextFrame = !isStable
		var scheduleNextFrame = false
		if (!isSameSegmentAndAtRest) {
		if (capturedSegment != currentSegment) {
		capturedSegment = currentSegment
		scheduleNextFrame = true
		@@ -396,6 +397,7 @@ private class ObservableComputations(
		capturedSpringState = currentSpringState
		scheduleNextFrame = true
		}
		}

		if (capturedInput != currentInput) {
		capturedInput = currentInput

mechanics/src/com/android/mechanics/impl/Computations.kt

+39 −6

Original line number	Diff line number	Diff line
		@@ -423,22 +423,55 @@ internal interface ComputeSpringState : ComputeAnimation {
		internal interface Computations : ComputeSpringState {
		val currentSpringState: SpringState

		val isSameSegmentAndAtRest: Boolean
		get() =
		lastAnimation.isAtRest &&
		lastSegment.spec == spec &&
		lastSegment.isValidForInput(currentInput, currentDirection)

		val currentDirectMapped: Float
		get() = currentSegment.mapping.map(currentInput) - currentAnimation.targetValue
		get() =
		if (isSameSegmentAndAtRest) {
		lastSegment.mapping.map(currentInput)
		} else {
		currentSegment.mapping.map(currentInput) - currentAnimation.targetValue
		}

		val currentAnimatedDelta: Float
		get() = currentAnimation.targetValue + currentSpringState.displacement
		get() =
		if (isSameSegmentAndAtRest) {
		0f
		} else {
		currentAnimation.targetValue + currentSpringState.displacement
		}

		val output: Float
		get() = currentDirectMapped + currentAnimatedDelta
		get() =
		if (isSameSegmentAndAtRest) {
		lastSegment.mapping.map(currentInput)
		} else {
		currentDirectMapped + currentAnimatedDelta
		}

		val outputTarget: Float
		get() = currentDirectMapped + currentAnimation.targetValue
		get() =
		if (isSameSegmentAndAtRest) {
		lastAnimation.targetValue
		} else {
		currentDirectMapped + currentAnimation.targetValue
		}

		val isStable: Boolean
		get() = currentSpringState == SpringState.AtRest
		get() =
		if (isSameSegmentAndAtRest) {
		true
		} else {
		currentSpringState == SpringState.AtRest
		}

		fun <T> semanticState(semanticKey: SemanticKey<T>): T? {
		return with(currentSegment) { spec.semanticState(semanticKey, key) }
		return with(if (isSameSegmentAndAtRest) lastSegment else currentSegment) {
		spec.semanticState(semanticKey, key)
		}
		}
		}

mechanics/src/com/android/mechanics/view/ViewMotionValue.kt

+6 −4

Original line number	Diff line number	Diff line
		@@ -277,10 +277,12 @@ private class ImperativeComputations(

		currentAnimationTimeNanos = frameTimeMillis * 1_000_000L

		if (!isSameSegmentAndAtRest) {
		currentSegment = computeCurrentSegment()
		currentGuaranteeState = computeCurrentGuaranteeState()
		currentAnimation = computeCurrentAnimation()
		currentSpringState = computeCurrentSpringState()
		}

		debugInspector?.run {
		frame =