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

Commit dffa7b8c authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Migrate REST_TO_UNLOCK flag to aconfig" into main

parents fa7ecaef 7ec7fd26

packages/SystemUI/aconfig/systemui.aconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -164,9 +164,17 @@ flag { 
   bug: "296122467"

   bug: "296122467"

}

}





flag {

   name: "rest_to_unlock"

   namespace: "systemui"

   description: "Require prolonged touch for fingerprint authentication"

   bug: "303672286"

}



flag {

flag {

   name: "record_issue_qs_tile"

   name: "record_issue_qs_tile"

   namespace: "systemui"

   namespace: "systemui"

   description: "Replace Record Trace QS Tile with expanded Record Issue QS Tile"

   description: "Replace Record Trace QS Tile with expanded Record Issue QS Tile"

   bug: "305049544"

   bug: "305049544"

}

}

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -240,11 +240,6 @@ object Flags { 
    @JvmField

    @JvmField

    val WALLPAPER_PICKER_PREVIEW_ANIMATION = releasedFlag("wallpaper_picker_preview_animation")

    val WALLPAPER_PICKER_PREVIEW_ANIMATION = releasedFlag("wallpaper_picker_preview_animation")





    /** Flag to enable rest to unlock feature. */

    // TODO(b/303672286): Tracking bug

    @JvmField

    val REST_TO_UNLOCK: UnreleasedFlag = unreleasedFlag("rest_to_unlock")



    /**

    /**

     * TODO(b/278086361): Tracking bug

     * TODO(b/278086361): Tracking bug

     * Complete rewrite of the interactions between System UI and Window Manager involving keyguard

     * Complete rewrite of the interactions between System UI and Window Manager involving keyguard

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/SideFpsProgressBarViewBinder.kt

+2 −4
Original line number Original line Diff line number Diff line
@@ -19,11 +19,10 @@ package com.android.systemui.keyguard.ui.binder 
import android.animation.ValueAnimator

import android.animation.ValueAnimator

import android.graphics.Point

import android.graphics.Point

import com.android.systemui.CoreStartable

import com.android.systemui.CoreStartable

import com.android.systemui.Flags

import com.android.systemui.biometrics.SideFpsController

import com.android.systemui.biometrics.SideFpsController

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.ui.view.SideFpsProgressBar

import com.android.systemui.keyguard.ui.view.SideFpsProgressBar

import com.android.systemui.keyguard.ui.viewmodel.SideFpsProgressBarViewModel

import com.android.systemui.keyguard.ui.viewmodel.SideFpsProgressBarViewModel

import com.android.systemui.log.SideFpsLogger

import com.android.systemui.log.SideFpsLogger
@@ -50,11 +49,10 @@ constructor( 
    private val sfpsController: dagger.Lazy<SideFpsController>,

    private val sfpsController: dagger.Lazy<SideFpsController>,

    private val logger: SideFpsLogger,

    private val logger: SideFpsLogger,

    private val commandRegistry: CommandRegistry,

    private val commandRegistry: CommandRegistry,

    private val featureFlagsClassic: FeatureFlagsClassic,

) : CoreStartable {

) : CoreStartable {





    override fun start() {

    override fun start() {

        if (!featureFlagsClassic.isEnabled(Flags.REST_TO_UNLOCK)) {

        if (!Flags.restToUnlock()) {

            return

            return

        }

        }

        // When the rest to unlock feature is disabled by the user, stop any coroutines that are

        // When the rest to unlock feature is disabled by the user, stop any coroutines that are

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt

+2 −4
Original line number Original line Diff line number Diff line
@@ -20,14 +20,13 @@ import android.animation.ValueAnimator 
import android.content.Context

import android.content.Context

import android.graphics.Point

import android.graphics.Point

import androidx.core.animation.doOnEnd

import androidx.core.animation.doOnEnd

import com.android.systemui.Flags

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor

import com.android.systemui.biometrics.domain.interactor.SideFpsSensorInteractor

import com.android.systemui.biometrics.domain.interactor.SideFpsSensorInteractor

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.isDefaultOrientation

import com.android.systemui.biometrics.shared.model.isDefaultOrientation

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.shared.model.AcquiredFingerprintAuthenticationStatus

import com.android.systemui.keyguard.shared.model.AcquiredFingerprintAuthenticationStatus

import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus

import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus
@@ -58,7 +57,6 @@ constructor( 
    private val sfpsSensorInteractor: SideFpsSensorInteractor,

    private val sfpsSensorInteractor: SideFpsSensorInteractor,

    displayStateInteractor: DisplayStateInteractor,

    displayStateInteractor: DisplayStateInteractor,

    @Application private val applicationScope: CoroutineScope,

    @Application private val applicationScope: CoroutineScope,

    private val featureFlagsClassic: FeatureFlagsClassic,

) {

) {

    private val _progress = MutableStateFlow(0.0f)

    private val _progress = MutableStateFlow(0.0f)

    private val _visible = MutableStateFlow(false)

    private val _visible = MutableStateFlow(false)
@@ -155,7 +153,7 @@ constructor( 
        sfpsSensorInteractor.isProlongedTouchRequiredForAuthentication

        sfpsSensorInteractor.isProlongedTouchRequiredForAuthentication





    init {

    init {

        if (featureFlagsClassic.isEnabled(Flags.REST_TO_UNLOCK)) {

        if (Flags.restToUnlock()) {

            launchAnimator()

            launchAnimator()

        }

        }

    }

    }