Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60e7013c authored by Chandru S's avatar Chandru S
Browse files

Remove fully launched flag 

Fixes: 295245791
Flag: NA
Test: everything builds
Test: manually, trigger face auth, the scanning animation doesn't pulse. Scanning animation grows out, remains constant and then shrinks
Change-Id: Ie381fd4916bc1f128f005298e21980c2221bc1b0
parent 1d6a854d

packages/SystemUI/res/values/flags.xml

+0 −2
Original line number Diff line number Diff line
@@ -38,6 +38,4 @@ 
         protected. -->

    <bool name="flag_battery_shield_icon">false</bool>



    <!-- Whether we want to stop pulsing while running the face scanning animation -->

    <bool name="flag_stop_pulsing_face_scanning_animation">true</bool>

</resources>

packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt

+2 −26
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.settingslib.Utils

import com.android.systemui.biometrics.AuthController

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.log.ScreenDecorationsLogger

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.util.asIndenting
@@ -56,7 +54,6 @@ class FaceScanningOverlay( 
    val mainExecutor: Executor,

    val logger: ScreenDecorationsLogger,

    val authController: AuthController,

    val featureFlags: FeatureFlags,

) : ScreenDecorations.DisplayCutoutView(context, pos) {

    private var showScanningAnim = false

    private val rimPaint = Paint()
@@ -297,8 +294,6 @@ class FaceScanningOverlay( 
    }



    private fun createFaceScanningRimAnimator(): AnimatorSet {

        val dontPulse = featureFlags.isEnabled(Flags.STOP_PULSING_FACE_SCANNING_ANIMATION)

        if (dontPulse) {

        return AnimatorSet().apply {

            playSequentially(

                    cameraProtectionAnimator,
@@ -306,14 +301,6 @@ class FaceScanningOverlay( 
            )

        }

    }

        return AnimatorSet().apply {

            playSequentially(

                cameraProtectionAnimator,

                createRimAppearAnimator(),

                createPulseAnimator()

            )

        }

    }



    private fun createRimAppearAnimator(): ValueAnimator {

        return ValueAnimator.ofFloat(
@@ -348,17 +335,6 @@ class FaceScanningOverlay( 
        invalidate()

    }



    private fun createPulseAnimator(): ValueAnimator {

        return ValueAnimator.ofFloat(

                PULSE_RADIUS_OUT, PULSE_RADIUS_IN).apply {

            duration = HALF_PULSE_DURATION

            interpolator = Interpolators.STANDARD

            repeatCount = 11 // Pulse inwards and outwards, reversing direction, 6 times

            repeatMode = ValueAnimator.REVERSE

            addUpdateListener(this@FaceScanningOverlay::updateRimProgress)

        }

    }



    private val keyguardUpdateMonitorCallback = object : KeyguardUpdateMonitorCallback() {

        override fun onBiometricAuthenticated(

            userId: Int,

packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.systemui.FaceScanningOverlay 
import com.android.systemui.biometrics.AuthController

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.log.ScreenDecorationsLogger

import com.android.systemui.plugins.statusbar.StatusBarStateController

import java.util.concurrent.Executor
@@ -48,7 +47,6 @@ class FaceScanningProviderFactory @Inject constructor( 
    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    @Main private val mainExecutor: Executor,

    private val logger: ScreenDecorationsLogger,

    private val featureFlags: FeatureFlags,

) : DecorProviderFactory() {

    private val display = context.display

    private val displayInfo = DisplayInfo()
@@ -88,7 +86,6 @@ class FaceScanningProviderFactory @Inject constructor( 
                                        keyguardUpdateMonitor,

                                        mainExecutor,

                                        logger,

                                        featureFlags,

                                )

                        )

                    }
@@ -113,7 +110,6 @@ class FaceScanningOverlayProviderImpl( 
    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    private val mainExecutor: Executor,

    private val logger: ScreenDecorationsLogger,

    private val featureFlags: FeatureFlags,

) : BoundDecorProvider() {

    override val viewId: Int = com.android.systemui.res.R.id.face_scanning_anim
@@ -148,7 +144,6 @@ class FaceScanningOverlayProviderImpl( 
                mainExecutor,

                logger,

                authController,

                featureFlags

        )

        view.id = viewId

        view.setColor(tintColor)

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −6
Original line number Diff line number Diff line
@@ -253,12 +253,6 @@ object Flags { 
    val KEYGUARD_WM_STATE_REFACTOR: UnreleasedFlag =

            unreleasedFlag("keyguard_wm_state_refactor")



    /** Flag to disable the face scanning animation pulsing. */

    // TODO(b/295245791): Tracking bug.

    @JvmField val STOP_PULSING_FACE_SCANNING_ANIMATION = resourceBooleanFlag(

            R.bool.flag_stop_pulsing_face_scanning_animation,

            "stop_pulsing_face_scanning_animation")



    // 300 - power menu

    // TODO(b/254512600): Tracking Bug

    @JvmField val POWER_MENU_LITE = releasedFlag("power_menu_lite")

packages/SystemUI/tests/src/com/android/systemui/FaceScanningProviderFactoryTest.kt

+0 −7
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.systemui.biometrics.AuthController

import com.android.systemui.decor.FaceScanningProviderFactory

import com.android.systemui.dump.logcatLogBuffer

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.log.ScreenDecorationsLogger

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.util.mockito.whenever
@@ -55,8 +53,6 @@ class FaceScanningProviderFactoryTest : SysuiTestCase() { 


    @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor



    @Mock private lateinit var display: Display



    private val displayId = 2



    @Before
@@ -82,8 +78,6 @@ class FaceScanningProviderFactoryTest : SysuiTestCase() { 
            R.bool.config_fillMainBuiltInDisplayCutout,

            true

        )

        val featureFlags = FakeFeatureFlags()

        featureFlags.set(Flags.STOP_PULSING_FACE_SCANNING_ANIMATION, true)

        underTest =

            FaceScanningProviderFactory(

                authController,
@@ -92,7 +86,6 @@ class FaceScanningProviderFactoryTest : SysuiTestCase() { 
                keyguardUpdateMonitor,

                mock(Executor::class.java),

                ScreenDecorationsLogger(logcatLogBuffer("FaceScanningProviderFactoryTest")),

                featureFlags,

            )



        whenever(authController.faceSensorLocation).thenReturn(Point(10, 10))