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

Commit ebb3b8c3 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Delete FACE_SCANNING_ANIM flag from sys-ui and config" into tm-qpr-dev... 

Merge "Delete FACE_SCANNING_ANIM flag from sys-ui and config" into tm-qpr-dev am: b24b559c am: c70f1cb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20272003



Change-Id: Ibc903331f44955738c2bc9ce861fdbc8bc5d09f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3152b191 c70f1cb1

packages/SystemUI/res-keyguard/values/config.xml

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
    <!-- Will display the bouncer on one side of the display, and the current user icon and

         user switcher on the other side -->

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

    <!-- Whether to show the face scanning animation on devices with face auth supported.

         The face scanning animation renders in a SW layer in ScreenDecorations.

         Enabling this will also render the camera protection in the SW layer

         (instead of HW, if relevant)."=-->

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

    <!-- Time to be considered a consecutive fingerprint failure in ms -->

    <integer name="fp_consecutive_failure_time_ms">3500</integer>

</resources>

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

+1 −5
Original line number Diff line number Diff line
@@ -34,8 +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.flags.Flags

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

import java.util.concurrent.Executor

import javax.inject.Inject
@@ -47,15 +45,13 @@ class FaceScanningProviderFactory @Inject constructor( 
    private val statusBarStateController: StatusBarStateController,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    @Main private val mainExecutor: Executor,

    private val featureFlags: FeatureFlags

) : DecorProviderFactory() {

    private val display = context.display

    private val displayInfo = DisplayInfo()



    override val hasProviders: Boolean

        get() {

            if (!featureFlags.isEnabled(Flags.FACE_SCANNING_ANIM) ||

                    authController.faceSensorLocation == null) {

            if (authController.faceSensorLocation == null) {

                return false

            }

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

+0 −3
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ object Flags { 
    @JvmField

    val BOUNCER_USER_SWITCHER = ResourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher)



    // TODO(b/254512694): Tracking Bug

    val FACE_SCANNING_ANIM = ResourceBooleanFlag(205, R.bool.config_enableFaceScanningAnimation)



    // TODO(b/254512676): Tracking Bug

    @JvmField val LOCKSCREEN_CUSTOM_CLOCKS = UnreleasedFlag(207, teamfood = true)