Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chandru S
2022-10-24 18:07:46 +00:00
committed by Android (Google) Code Review
parent 513d000b0b 23fd1ada4f
commit b24b559ceb
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res-keyguard/values/config.xml
View File

@@ -28,11 +28,6 @@
<!-- Will display the bouncer on one side of the display, and the current user icon and <!-- Will display the bouncer on one side of the display, and the current user icon and
user switcher on the other side --> user switcher on the other side -->
<bool name="config_enableBouncerUserSwitcher">false</bool> <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 --> <!-- Time to be considered a consecutive fingerprint failure in ms -->
<integer name="fp_consecutive_failure_time_ms">3500</integer> <integer name="fp_consecutive_failure_time_ms">3500</integer>
</resources> </resources>

6
packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt
View File

@@ -34,8 +34,6 @@ import com.android.systemui.FaceScanningOverlay
import com.android.systemui.biometrics.AuthController import com.android.systemui.biometrics.AuthController
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Main 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 com.android.systemui.plugins.statusbar.StatusBarStateController
import java.util.concurrent.Executor import java.util.concurrent.Executor
import javax.inject.Inject import javax.inject.Inject
@@ -47,15 +45,13 @@ class FaceScanningProviderFactory @Inject constructor(
private val statusBarStateController: StatusBarStateController, private val statusBarStateController: StatusBarStateController,
private val keyguardUpdateMonitor: KeyguardUpdateMonitor, private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
@Main private val mainExecutor: Executor, @Main private val mainExecutor: Executor,
private val featureFlags: FeatureFlags
) : DecorProviderFactory() { ) : DecorProviderFactory() {
private val display = context.display private val display = context.display
private val displayInfo = DisplayInfo() private val displayInfo = DisplayInfo()
override val hasProviders: Boolean override val hasProviders: Boolean
get() { get() {
if (!featureFlags.isEnabled(Flags.FACE_SCANNING_ANIM) || if (authController.faceSensorLocation == null) {
authController.faceSensorLocation == null) {
return false return false
} }

3
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -80,9 +80,6 @@ object Flags {
@JvmField @JvmField
val BOUNCER_USER_SWITCHER = ResourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher) 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 // TODO(b/254512676): Tracking Bug
@JvmField val LOCKSCREEN_CUSTOM_CLOCKS = UnreleasedFlag(207, teamfood = true) @JvmField val LOCKSCREEN_CUSTOM_CLOCKS = UnreleasedFlag(207, teamfood = true)