Merge "Fix sdfps overlay disappear" into udc-dev (dcd8a29b) · Commits · e / os / android_frameworks_base

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

+0 −62

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

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.app.ActivityTaskManager
		import android.content.Context
		import android.content.res.Configuration
		@@ -43,7 +41,6 @@ import android.view.Surface
		import android.view.View
		import android.view.View.AccessibilityDelegate
		import android.view.ViewPropertyAnimator
		import android.view.WindowInsets
		import android.view.WindowManager
		import android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION
		import android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
		@@ -61,7 +58,6 @@ import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor
		import com.android.systemui.recents.OverviewProxyService
		import com.android.systemui.util.concurrency.DelayableExecutor
		import com.android.systemui.util.traceSection
		import java.io.PrintWriter
		@@ -83,7 +79,6 @@ constructor(
		fingerprintManager: FingerprintManager?,
		private val windowManager: WindowManager,
		private val activityTaskManager: ActivityTaskManager,
		overviewProxyService: OverviewProxyService,
		displayManager: DisplayManager,
		private val displayStateInteractor: DisplayStateInteractor,
		@Main private val mainExecutor: DelayableExecutor,
		@@ -112,19 +107,6 @@ constructor(

		@VisibleForTesting val orientationListener = orientationReasonListener.orientationListener

		@VisibleForTesting
		val overviewProxyListener =
		object : OverviewProxyService.OverviewProxyListener {
		override fun onTaskbarStatusUpdated(visible: Boolean, stashed: Boolean) {
		overlayView?.let { view ->
		handler.postDelayed({ updateOverlayVisibility(view) }, 500)
		}
		}
		}

		private val animationDuration =
		context.resources.getInteger(android.R.integer.config_mediumAnimTime).toLong()

		private val isReverseDefaultRotation =
		context.resources.getBoolean(com.android.internal.R.bool.config_reverseDefaultRotation)

		@@ -142,7 +124,6 @@ constructor(
		field = value
		field?.let { newView ->
		windowManager.addView(newView, overlayViewParams)
		updateOverlayVisibility(newView)
		orientationListener.enable()
		}
		}
		@@ -181,7 +162,6 @@ constructor(
		override fun hide(sensorId: Int) = hide(SideFpsUiRequestSource.AUTO_SHOW)
		}
		)
		overviewProxyService.addCallback(overviewProxyListener)
		listenForAlternateBouncerVisibility()

		dumpManager.registerDumpable(this)
		@@ -340,45 +320,6 @@ constructor(
		windowManager.updateViewLayout(overlayView, overlayViewParams)
		}

		private fun updateOverlayVisibility(view: View) {
		if (view != overlayView) {
		return
		}
		// hide after a few seconds if the sensor is oriented down and there are
		// large overlapping system bars
		var rotation = context.display?.rotation

		if (rotation != null) {
		rotation = getRotationFromDefault(rotation)
		}

		if (
		windowManager.currentWindowMetrics.windowInsets.hasBigNavigationBar() &&
		((rotation == Surface.ROTATION_270 && overlayOffsets.isYAligned()) \|\|
		(rotation == Surface.ROTATION_180 && !overlayOffsets.isYAligned()))
		) {
		overlayHideAnimator =
		view
		.animate()
		.alpha(0f)
		.setStartDelay(3_000)
		.setDuration(animationDuration)
		.setListener(
		object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator) {
		view.visibility = View.GONE
		overlayHideAnimator = null
		}
		}
		)
		} else {
		overlayHideAnimator?.cancel()
		overlayHideAnimator = null
		view.alpha = 1f
		view.visibility = View.VISIBLE
		}
		}

		private fun getRotationFromDefault(rotation: Int): Int =
		if (isReverseDefaultRotation) (rotation + 1) % 4 else rotation
		}
		@@ -426,9 +367,6 @@ private fun SensorLocationInternal.isYAligned(): Boolean = sensorLocationY != 0
		private fun Display.isNaturalOrientation(): Boolean =
		rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180

		private fun WindowInsets.hasBigNavigationBar(): Boolean =
		getInsets(WindowInsets.Type.navigationBars()).bottom >= 70

		private fun LottieAnimationView.addOverlayDynamicColor(
		context: Context,
		@BiometricOverlayConstants.ShowReason reason: Int

packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt

+0 −15

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintA
		import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository
		import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.recents.OverviewProxyService
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import com.android.systemui.util.concurrency.FakeExecutor
		import com.android.systemui.util.time.FakeSystemClock
		@@ -111,7 +110,6 @@ class SideFpsControllerTest : SysuiTestCase() {
		@Mock lateinit var activityTaskManager: ActivityTaskManager
		@Mock lateinit var sideFpsView: View
		@Mock lateinit var displayManager: DisplayManager
		@Mock lateinit var overviewProxyService: OverviewProxyService
		@Mock lateinit var handler: Handler
		@Mock lateinit var dumpManager: DumpManager
		@Captor lateinit var overlayCaptor: ArgumentCaptor<View>
		@@ -262,7 +260,6 @@ class SideFpsControllerTest : SysuiTestCase() {
		fingerprintManager,
		windowManager,
		activityTaskManager,
		overviewProxyService,
		displayManager,
		displayStateInteractor,
		executor,
		@@ -686,18 +683,6 @@ class SideFpsControllerTest : SysuiTestCase() {
		verify(windowManager).removeView(any())
		}

		private fun hidesWithTaskbar(visible: Boolean) {
		overlayController.show(SENSOR_ID, REASON_UNKNOWN)
		executor.runAllReady()

		sideFpsController.overviewProxyListener.onTaskbarStatusUpdated(true, false)
		executor.runAllReady()

		verify(windowManager).addView(any(), any())
		verify(windowManager, never()).removeView(any())
		verify(sideFpsView).visibility = if (visible) View.VISIBLE else View.GONE
		}

		/**
		* {@link SideFpsController#updateOverlayParams} calculates indicator placement for ROTATION_0,
		* and uses RotateUtils.rotateBounds to map to the correct indicator location given the device