Merge "Add debug logging to SideFpsController" into 24D1-dev (4de220f9) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -101,6 +101,8 @@ import com.android.systemui.util.ViewController;
		import com.android.systemui.util.kotlin.JavaAdapter;
		import com.android.systemui.util.settings.GlobalSettings;

		import dagger.Lazy;

		import java.io.File;
		import java.util.Arrays;
		import java.util.Optional;
		@@ -108,7 +110,6 @@ import java.util.Optional;
		import javax.inject.Inject;
		import javax.inject.Provider;

		import dagger.Lazy;
		import kotlinx.coroutines.Job;

		/** Controller for {@link KeyguardSecurityContainer} */
		@@ -589,6 +590,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		public void updateSideFpsVisibility(boolean isVisible) {
		SideFpsControllerRefactor.assertInLegacyMode();
		if (!mSideFpsController.isPresent()) {
		Log.d(TAG, "updateSideFpsVisibility(isVisible = " + isVisible + "): "
		+ "!mSideFpsController.isPresent(): ignoring request");
		return;
		}

packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt

+21 −2

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ constructor(
		private var overlayView: View? = null
		set(value) {
		field?.let { oldView ->
		Log.d(TAG, "overlayView updated: removing existing view $oldView")
		val lottie = oldView.requireViewById(R.id.sidefps_animation) as LottieAnimationView
		lottie.pauseAnimation()
		lottie.removeAllLottieOnCompositionLoadedListener()
		@@ -135,6 +136,7 @@ constructor(

		field = value
		field?.let { newView ->
		Log.d(TAG, "overlayView updated: adding new view $newView")
		if (requests.contains(SideFpsUiRequestSource.PRIMARY_BOUNCER)) {
		newView.alpha = 0f
		overlayShowAnimator =
		@@ -223,11 +225,20 @@ constructor(
		traceSection(
		"SideFpsController#show(request=${request.name}, reason=$reason)"
		) {
		Log.d(
		TAG,
		"show(request=${request.name}, reason=$reason): " +
		"overlayView == null, adding request"
		)
		requests.add(request)
		createOverlayForDisplay(reason)
		}
		} else {
		Log.v(TAG, "overlay already shown")
		Log.d(
		TAG,
		"show(request=${request.name}, reason=$reason): " +
		"overlay already shown, ignoring request"
		)
		}
		}
		}
		@@ -236,10 +247,18 @@ constructor(
		/** Hides the fps overlay if shown. */
		fun hide(request: SideFpsUiRequestSource) {
		SideFpsControllerRefactor.assertInLegacyMode()
		Log.d(TAG, "hide(request=${request.name}): removing request")
		requests.remove(request)
		mainExecutor.execute {
		if (requests.isEmpty()) {
		traceSection("SideFpsController#hide(${request.name})") { overlayView = null }
		traceSection("SideFpsController#hide(${request.name})") {
		Log.d(
		TAG,
		"hide(request=${request.name}): requests.isEmpty(), " +
		"setting overlayView = null"
		)
		overlayView = null
		}
		}
		}
		}