Merge "Remove animation logging" into main (4c8c5cb3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/logging/KeyguardTransitionAnimationLogger.kt

deleted100644 → 0

+0 −74

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.keyguard.logging

		import com.android.systemui.keyguard.shared.model.TransitionStep
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.log.dagger.KeyguardTransitionAnimationLog
		import javax.inject.Inject

		private const val TAG = "KeyguardTransitionAnimationLog"

		/**
		* Generic logger for keyguard that's wrapping [LogBuffer]. This class should be used for adding
		* temporary logs or logs for smaller classes when creating whole new [LogBuffer] wrapper might be
		* an overkill.
		*/
		class KeyguardTransitionAnimationLogger
		@Inject
		constructor(
		@KeyguardTransitionAnimationLog val buffer: LogBuffer,
		) {
		@JvmOverloads
		fun logCreate(
		name: String? = null,
		start: Float,
		) {
		if (name == null) return

		buffer.log(
		TAG,
		LogLevel.DEBUG,
		{
		str1 = name
		str2 = "$start"
		},
		{ "[$str1] starts at: $str2" }
		)
		}

		@JvmOverloads
		fun logTransitionStep(
		name: String? = null,
		step: TransitionStep,
		value: Float? = null,
		) {
		if (name == null) return

		buffer.log(
		TAG,
		LogLevel.DEBUG,
		{
		str1 = "[$name][${step.transitionState}]"
		str2 = "${step.value}"
		str3 = "$value"
		},
		{ "$str1 transitionStep=$str2, animationValue=$str3" }
		)
		}
		}

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

+11 −15

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package com.android.systemui.keyguard.ui

		import android.view.animation.Interpolator
		import com.android.app.animation.Interpolators.LINEAR
		import com.android.keyguard.logging.KeyguardTransitionAnimationLogger
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.Edge
		@@ -51,7 +50,6 @@ class KeyguardTransitionAnimationFlow
		@Inject
		constructor(
		private val transitionInteractor: KeyguardTransitionInteractor,
		private val logger: KeyguardTransitionAnimationLogger,
		private val shadeInteractor: Lazy<ShadeInteractor>,
		) {
		/** Invoke once per transition between FROM->TO states to get access to a shared flow. */
		@@ -180,7 +178,6 @@ constructor(

		val start = (startTime / transitionDuration).toFloat()
		val chunks = (transitionDuration / duration).toFloat()
		logger.logCreate(name, start)

		fun stepToValue(step: TransitionStep): Float? {
		val value = (step.value - start) * chunks
		@@ -240,7 +237,6 @@ constructor(
		FINISHED -> onFinish?.invoke()
		},
		)
		.also { logger.logTransitionStep(name, step, it.value) }
		}
		}
		.distinctUntilChanged()

packages/SystemUI/tests/utils/src/com/android/keyguard/logging/KeyguardTransitionAnimationLoggerKosmos.kt

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.keyguard.logging

		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.util.mockito.mock

		var Kosmos.keyguardTransitionAnimationLogger by
		Kosmos.Fixture { mock<KeyguardTransitionAnimationLogger>() }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowKosmos.kt

+0 −2

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

		package com.android.systemui.keyguard.ui

		import com.android.keyguard.logging.keyguardTransitionAnimationLogger
		import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		@@ -25,7 +24,6 @@ import com.android.systemui.shade.domain.interactor.shadeInteractor
		val Kosmos.keyguardTransitionAnimationFlow by Fixture {
		KeyguardTransitionAnimationFlow(
		transitionInteractor = keyguardTransitionInteractor,
		logger = keyguardTransitionAnimationLogger,
		shadeInteractor = { shadeInteractor },
		)
		}