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

Commit 01f5ca18 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge changes I7825436b,I93c97788 into main 

* changes:
  Remove Udfps's BackgroundViewModel
  Cleanup unused code that is leftover
parents 4ef1ce49 3ef50c5b

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+0 −6
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import com.android.systemui.flags.FeatureFlags; 
import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.ui.viewmodel.UdfpsKeyguardViewModels;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -124,8 +123,6 @@ import org.mockito.junit.MockitoRule; 
import java.util.ArrayList;

import java.util.List;



import javax.inject.Provider;



@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWithLooper(setAsMainLooper = true)
@@ -216,8 +213,6 @@ public class UdfpsControllerTest extends SysuiTestCase { 
    @Mock

    private UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate;

    @Mock

    private Provider<UdfpsKeyguardViewModels> mUdfpsKeyguardViewModels;

    @Mock

    private SelectedUserInteractor mSelectedUserInteractor;



    // Capture listeners so that they can be used to send events
@@ -339,7 +334,6 @@ public class UdfpsControllerTest extends SysuiTestCase { 
                mInputManager,

                mock(KeyguardFaceAuthInteractor.class),

                mUdfpsKeyguardAccessibilityDelegate,

                mUdfpsKeyguardViewModels,

                mSelectedUserInteractor,

                mFpsUnlockTracker,

                mKeyguardTransitionInteractor,

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

+1 −7
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter;

import com.android.systemui.keyguard.ui.viewmodel.UdfpsKeyguardViewModels;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -115,7 +113,6 @@ import java.util.Set; 
import java.util.concurrent.Executor;



import javax.inject.Inject;

import javax.inject.Provider;



import kotlinx.coroutines.ExperimentalCoroutinesApi;
@@ -152,7 +149,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
    @NonNull private final SystemUIDialogManager mDialogManager;

    @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @NonNull private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;

    @NonNull private final Provider<UdfpsKeyguardViewModels> mUdfpsKeyguardViewModels;

    @NonNull private final VibratorHelper mVibrator;

    @NonNull private final FalsingManager mFalsingManager;

    @NonNull private final PowerManager mPowerManager;
@@ -623,7 +619,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        } else {

            onKeyguard = mOverlay != null

                    && mOverlay.getAnimationViewController()

                        instanceof UdfpsKeyguardViewControllerAdapter;

                        instanceof UdfpsKeyguardViewControllerLegacy;

        }

        return onKeyguard

                && mKeyguardStateController.canDismissLockScreen()
@@ -666,7 +662,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
            @NonNull InputManager inputManager,

            @NonNull KeyguardFaceAuthInteractor keyguardFaceAuthInteractor,

            @NonNull UdfpsKeyguardAccessibilityDelegate udfpsKeyguardAccessibilityDelegate,

            @NonNull Provider<UdfpsKeyguardViewModels> udfpsKeyguardViewModelsProvider,

            @NonNull SelectedUserInteractor selectedUserInteractor,

            @NonNull FpsUnlockTracker fpsUnlockTracker,

            @NonNull KeyguardTransitionInteractor keyguardTransitionInteractor,
@@ -737,7 +732,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                    return Unit.INSTANCE;

                });

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mUdfpsKeyguardViewModels = udfpsKeyguardViewModelsProvider;



        final UdfpsOverlayController mUdfpsOverlayController = new UdfpsOverlayController();

        mFingerprintManager.setUdfpsOverlayController(mUdfpsOverlayController);

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

+1 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor 
import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor

import com.android.systemui.dump.DumpManager

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter

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

import com.android.systemui.res.R

import com.android.systemui.statusbar.LockscreenShadeTransitionController
@@ -438,7 +437,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
            if (DeviceEntryUdfpsRefactor.isEnabled) {

                !keyguardStateController.isShowing

            } else {

                animation !is UdfpsKeyguardViewControllerAdapter

                animation !is UdfpsKeyguardViewControllerLegacy

            }



        if (keyguardNotShowing) {

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

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.systemui.dump.DumpManager 
import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

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

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

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter

import com.android.systemui.lifecycle.repeatWhenAttached

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

import com.android.systemui.res.R
@@ -81,8 +80,7 @@ open class UdfpsKeyguardViewControllerLegacy( 
        primaryBouncerInteractor,

        systemUIDialogManager,

        dumpManager,

    ),

    UdfpsKeyguardViewControllerAdapter {

    ) {

    private val uniqueIdentifier = this.toString()

    private var showingUdfpsBouncer = false

    private var udfpsRequested = false

packages/SystemUI/src/com/android/systemui/biometrics/ui/controller/UdfpsKeyguardViewController.kt

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.biometrics.ui.controller



import com.android.systemui.biometrics.UdfpsAnimationViewController

import com.android.systemui.biometrics.UdfpsKeyguardView

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.dump.DumpManager

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter

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

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

import com.android.systemui.statusbar.phone.SystemUIDialogManager

import kotlinx.coroutines.ExperimentalCoroutinesApi



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

@ExperimentalCoroutinesApi

open class UdfpsKeyguardViewController(

    val view: UdfpsKeyguardView,

    statusBarStateController: StatusBarStateController,

    primaryBouncerInteractor: PrimaryBouncerInteractor,

    systemUIDialogManager: SystemUIDialogManager,

    dumpManager: DumpManager,

    private val alternateBouncerInteractor: AlternateBouncerInteractor,

    udfpsKeyguardViewModels: UdfpsKeyguardViewModels,

) :

    UdfpsAnimationViewController<UdfpsKeyguardView>(

        view,

        statusBarStateController,

        primaryBouncerInteractor,

        systemUIDialogManager,

        dumpManager,

    ),

    UdfpsKeyguardViewControllerAdapter {

    private val uniqueIdentifier = this.toString()

    override val tag: String

        get() = TAG



    init {

        udfpsKeyguardViewModels.bindViews(view)

    }



    public override fun onViewAttached() {

        super.onViewAttached()

        alternateBouncerInteractor.setAlternateBouncerUIAvailable(true, uniqueIdentifier)

    }



    public override fun onViewDetached() {

        super.onViewDetached()

        alternateBouncerInteractor.setAlternateBouncerUIAvailable(false, uniqueIdentifier)

    }



    override fun shouldPauseAuth(): Boolean {

        return !view.isVisible()

    }



    override fun listenForTouchesOutsideView(): Boolean {

        return true

    }



    companion object {

        private const val TAG = "UdfpsKeyguardViewController"

    }

}