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

Commit b2bd32e6 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Rename UdfpsKeyguardView files to -Legacy" into udc-dev am: bcca780a 

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



Change-Id: I184ed0df1a1a3a68c6100ba37e72c1220ae3baeb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b93ceed bcca780a

packages/SystemUI/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ filegroup { 
        "tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapterTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsDisplayModeTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerBaseTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerTest.java",

        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt",

        "tests/src/com/android/systemui/biometrics/UdfpsShellTest.kt",

        "tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt",

    ],

packages/SystemUI/res/layout/udfps_keyguard_view.xml→packages/SystemUI/res/layout/udfps_keyguard_view_legacy.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.biometrics.UdfpsKeyguardView

<com.android.systemui.biometrics.UdfpsKeyguardViewLegacy

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/udfps_animation_view"
@@ -23,4 +23,4 @@ 


    <!-- Add fingerprint views here. See udfps_keyguard_view_internal.xml. -->



</com.android.systemui.biometrics.UdfpsKeyguardView>
 
</com.android.systemui.biometrics.UdfpsKeyguardViewLegacy>

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+2 −1
Original line number Diff line number Diff line
@@ -780,7 +780,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { 


    private boolean shouldTryToDismissKeyguard() {

        return mOverlay != null

                && mOverlay.getAnimationViewController() instanceof UdfpsKeyguardViewController

                && mOverlay.getAnimationViewController()

                instanceof UdfpsKeyguardViewControllerLegacy

                && mKeyguardStateController.canDismissLockScreen()

                && !mAttemptedToDismissKeyguard;

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                )

            }

            REASON_AUTH_KEYGUARD -> {

                UdfpsKeyguardViewController(

                    view.addUdfpsView(R.layout.udfps_keyguard_view) {

                UdfpsKeyguardViewControllerLegacy(

                    view.addUdfpsView(R.layout.udfps_keyguard_view_legacy) {

                        updateSensorLocation(sensorBounds)

                    },

                    statusBarStateController,
@@ -413,7 +413,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
    }



    private fun shouldRotate(animation: UdfpsAnimationViewController<*>?): Boolean {

        if (animation !is UdfpsKeyguardViewController) {

        if (animation !is UdfpsKeyguardViewControllerLegacy) {

            // always rotate view if we're not on the keyguard

            return true

        }

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt→packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt

+10 −10
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ import kotlinx.coroutines.Job 
import kotlinx.coroutines.launch



/** Class that coordinates non-HBM animations during keyguard authentication. */

open class UdfpsKeyguardViewController

open class UdfpsKeyguardViewControllerLegacy

constructor(

    private val view: UdfpsKeyguardView,

    private val view: UdfpsKeyguardViewLegacy,

    statusBarStateController: StatusBarStateController,

    shadeExpansionStateManager: ShadeExpansionStateManager,

    private val keyguardViewManager: StatusBarKeyguardViewManager,
@@ -72,7 +72,7 @@ constructor( 
    private val primaryBouncerInteractor: PrimaryBouncerInteractor,

    private val alternateBouncerInteractor: AlternateBouncerInteractor,

) :

    UdfpsAnimationViewController<UdfpsKeyguardView>(

    UdfpsAnimationViewController<UdfpsKeyguardViewLegacy>(

        view,

        statusBarStateController,

        shadeExpansionStateManager,
@@ -100,7 +100,7 @@ constructor( 
                view.onDozeAmountChanged(

                    animation.animatedFraction,

                    animation.animatedValue as Float,

                    UdfpsKeyguardView.ANIMATION_UNLOCKED_SCREEN_OFF

                    UdfpsKeyguardViewLegacy.ANIMATION_UNLOCKED_SCREEN_OFF

                )

            }

        }
@@ -123,7 +123,7 @@ constructor( 
                    view.onDozeAmountChanged(

                        linear,

                        eased,

                        UdfpsKeyguardView.ANIMATION_BETWEEN_AOD_AND_LOCKSCREEN

                        UdfpsKeyguardViewLegacy.ANIMATION_BETWEEN_AOD_AND_LOCKSCREEN

                    )

                }

                lastDozeAmount = linear
@@ -131,7 +131,7 @@ constructor( 
            }



            override fun onStateChanged(statusBarState: Int) {

                this@UdfpsKeyguardViewController.statusBarState = statusBarState

                this@UdfpsKeyguardViewControllerLegacy.statusBarState = statusBarState

                updateAlpha()

                updatePauseAuth()

            }
@@ -198,7 +198,7 @@ constructor( 
    private val statusBarKeyguardViewManagerCallback: KeyguardViewManagerCallback =

        object : KeyguardViewManagerCallback {

            override fun onQSExpansionChanged(qsExpansion: Float) {

                this@UdfpsKeyguardViewController.qsExpansion = qsExpansion

                this@UdfpsKeyguardViewControllerLegacy.qsExpansion = qsExpansion

                updateAlpha()

                updatePauseAuth()

            }
@@ -296,7 +296,7 @@ constructor( 
        updateAlpha()

        updatePauseAuth()

        keyguardViewManager.setOccludingAppBiometricUI(occludingAppBiometricUI)

        lockScreenShadeTransitionController.udfpsKeyguardViewController = this

        lockScreenShadeTransitionController.mUdfpsKeyguardViewControllerLegacy = this

        activityLaunchAnimator.addListener(activityLaunchAnimatorListener)

        view.mUseExpandedOverlay = useExpandedOverlay

        view.startIconAsyncInflate()
@@ -312,8 +312,8 @@ constructor( 
        keyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false)

        configurationController.removeCallback(configurationListener)

        shadeExpansionStateManager.removeExpansionListener(shadeExpansionListener)

        if (lockScreenShadeTransitionController.udfpsKeyguardViewController === this) {

            lockScreenShadeTransitionController.udfpsKeyguardViewController = null

        if (lockScreenShadeTransitionController.mUdfpsKeyguardViewControllerLegacy === this) {

            lockScreenShadeTransitionController.mUdfpsKeyguardViewControllerLegacy = null

        }

        activityLaunchAnimator.removeListener(activityLaunchAnimatorListener)

        keyguardViewManager.removeCallback(statusBarKeyguardViewManagerCallback)