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

Commit afd47f3c authored by Caitlin Cassidy's avatar Caitlin Cassidy
Browse files

[Status Bar Refactor] 2.3/N Migrate Udfps classes to the correct 

listener interface.

Test: atest SystemUITests
Bug: 200063118
Change-Id: Iaa15b81b71fde917b8f4ede2193842f1548d9062
parent b3a74270

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

+16 −20
Original line number Original line Diff line number Diff line
@@ -23,12 +23,12 @@ import android.graphics.RectF; 
import com.android.systemui.Dumpable;

import com.android.systemui.Dumpable;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

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

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

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

import com.android.systemui.util.ViewController;

import com.android.systemui.util.ViewController;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.Optional;





/**

/**

 * Handles:

 * Handles:
@@ -43,7 +43,7 @@ import java.util.Optional; 
abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>

abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>

        extends ViewController<T> implements Dumpable {

        extends ViewController<T> implements Dumpable {

    @NonNull final StatusBarStateController mStatusBarStateController;

    @NonNull final StatusBarStateController mStatusBarStateController;

    @NonNull final Optional<StatusBar> mStatusBarOptional;

    @NonNull final PanelExpansionStateManager mPanelExpansionStateManager;

    @NonNull final DumpManager mDumpManger;

    @NonNull final DumpManager mDumpManger;





    boolean mNotificationShadeExpanded;

    boolean mNotificationShadeExpanded;
@@ -51,11 +51,11 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
    protected UdfpsAnimationViewController(

    protected UdfpsAnimationViewController(

            T view,

            T view,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull Optional<StatusBar> statusBarOptional,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull DumpManager dumpManager) {

            @NonNull DumpManager dumpManager) {

        super(view);

        super(view);

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;

        mStatusBarOptional = statusBarOptional;

        mPanelExpansionStateManager = panelExpansionStateManager;

        mDumpManger = dumpManager;

        mDumpManger = dumpManager;

    }

    }
@@ -63,17 +63,13 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 




    @Override

    @Override

    protected void onViewAttached() {

    protected void onViewAttached() {

        mStatusBarOptional.ifPresent(

        mPanelExpansionStateManager.addListener(mPanelExpansionListener);

                statusBar -> statusBar.addExpansionChangedListener(

                        mStatusBarExpansionChangedListener));

        mDumpManger.registerDumpable(getDumpTag(), this);

        mDumpManger.registerDumpable(getDumpTag(), this);

    }

    }





    @Override

    @Override

    protected void onViewDetached() {

    protected void onViewDetached() {

        mStatusBarOptional.ifPresent(

        mPanelExpansionStateManager.removeListener(mPanelExpansionListener);

                statusBar -> statusBar.removeExpansionChangedListener(

                        mStatusBarExpansionChangedListener));

        mDumpManger.unregisterDumpable(getDumpTag());

        mDumpManger.unregisterDumpable(getDumpTag());

    }

    }
@@ -182,12 +178,12 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
     */

     */

    void onTouchOutsideView() { }

    void onTouchOutsideView() { }





    private final StatusBar.ExpansionChangedListener mStatusBarExpansionChangedListener =

    private final PanelExpansionListener mPanelExpansionListener = new PanelExpansionListener() {

            new StatusBar.ExpansionChangedListener() {

        @Override

        @Override

                public void onExpansionChanged(float expansion, boolean expanded) {

        public void onPanelExpansionChanged(

                float fraction, boolean expanded, boolean tracking) {

            mNotificationShadeExpanded = expanded;

            mNotificationShadeExpanded = expanded;

                    mView.onExpansionChanged(expansion, expanded);

            mView.onExpansionChanged(fraction, expanded);

            updatePauseAuth();

            updatePauseAuth();

        }

        }

    };

    };

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -20,9 +20,7 @@ import android.annotation.NonNull; 




import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

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

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

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;



import java.util.Optional;





/**

/**

 * Class that coordinates non-HBM animations for biometric prompt.

 * Class that coordinates non-HBM animations for biometric prompt.
@@ -31,9 +29,9 @@ class UdfpsBpViewController extends UdfpsAnimationViewController<UdfpsBpView> { 
    protected UdfpsBpViewController(

    protected UdfpsBpViewController(

            @NonNull UdfpsBpView view,

            @NonNull UdfpsBpView view,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull Optional<StatusBar> statusBarOptional,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull DumpManager dumpManager) {

            @NonNull DumpManager dumpManager) {

        super(view, statusBarStateController, statusBarOptional, dumpManager);

        super(view, statusBarStateController, panelExpansionStateManager, dumpManager);

    }

    }





    @Override

    @Override

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -69,9 +69,9 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -112,7 +112,7 @@ public class UdfpsController implements DozeReceiver { 
    @NonNull private final LayoutInflater mInflater;

    @NonNull private final LayoutInflater mInflater;

    private final WindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final DelayableExecutor mFgExecutor;

    private final DelayableExecutor mFgExecutor;

    @NonNull private final Optional<StatusBar> mStatusBarOptional;

    @NonNull private final PanelExpansionStateManager mPanelExpansionStateManager;

    @NonNull private final StatusBarStateController mStatusBarStateController;

    @NonNull private final StatusBarStateController mStatusBarStateController;

    @NonNull private final KeyguardStateController mKeyguardStateController;

    @NonNull private final KeyguardStateController mKeyguardStateController;

    @NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;

    @NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
@@ -521,7 +521,7 @@ public class UdfpsController implements DozeReceiver { 
            @NonNull WindowManager windowManager,

            @NonNull WindowManager windowManager,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull StatusBarStateController statusBarStateController,

            @Main DelayableExecutor fgExecutor,

            @Main DelayableExecutor fgExecutor,

            @NonNull Optional<StatusBar> statusBarOptional,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            @NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            @NonNull DumpManager dumpManager,

            @NonNull DumpManager dumpManager,

            @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,

            @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -550,7 +550,7 @@ public class UdfpsController implements DozeReceiver { 
        mFingerprintManager = checkNotNull(fingerprintManager);

        mFingerprintManager = checkNotNull(fingerprintManager);

        mWindowManager = windowManager;

        mWindowManager = windowManager;

        mFgExecutor = fgExecutor;

        mFgExecutor = fgExecutor;

        mStatusBarOptional = statusBarOptional;

        mPanelExpansionStateManager = panelExpansionStateManager;

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;

        mKeyguardStateController = keyguardStateController;

        mKeyguardStateController = keyguardStateController;

        mKeyguardViewManager = statusBarKeyguardViewManager;

        mKeyguardViewManager = statusBarKeyguardViewManager;
@@ -805,7 +805,7 @@ public class UdfpsController implements DozeReceiver { 
                        enrollView,

                        enrollView,

                        mServerRequest.mEnrollHelper,

                        mServerRequest.mEnrollHelper,

                        mStatusBarStateController,

                        mStatusBarStateController,

                        mStatusBarOptional,

                        mPanelExpansionStateManager,

                        mDumpManager

                        mDumpManager

                );

                );

            case BiometricOverlayConstants.REASON_AUTH_KEYGUARD:

            case BiometricOverlayConstants.REASON_AUTH_KEYGUARD:
@@ -815,7 +815,7 @@ public class UdfpsController implements DozeReceiver { 
                return new UdfpsKeyguardViewController(

                return new UdfpsKeyguardViewController(

                        keyguardView,

                        keyguardView,

                        mStatusBarStateController,

                        mStatusBarStateController,

                        mStatusBarOptional,

                        mPanelExpansionStateManager,

                        mKeyguardViewManager,

                        mKeyguardViewManager,

                        mKeyguardUpdateMonitor,

                        mKeyguardUpdateMonitor,

                        mDumpManager,

                        mDumpManager,
@@ -833,7 +833,7 @@ public class UdfpsController implements DozeReceiver { 
                return new UdfpsBpViewController(

                return new UdfpsBpViewController(

                        bpView,

                        bpView,

                        mStatusBarStateController,

                        mStatusBarStateController,

                        mStatusBarOptional,

                        mPanelExpansionStateManager,

                        mDumpManager

                        mDumpManager

                );

                );

            case BiometricOverlayConstants.REASON_AUTH_OTHER:

            case BiometricOverlayConstants.REASON_AUTH_OTHER:
@@ -843,7 +843,7 @@ public class UdfpsController implements DozeReceiver { 
                return new UdfpsFpmOtherViewController(

                return new UdfpsFpmOtherViewController(

                        authOtherView,

                        authOtherView,

                        mStatusBarStateController,

                        mStatusBarStateController,

                        mStatusBarOptional,

                        mPanelExpansionStateManager,

                        mDumpManager

                        mDumpManager

                );

                );

            default:

            default:

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -22,9 +22,7 @@ import android.graphics.PointF; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

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

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

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;



import java.util.Optional;





/**

/**

 * Class that coordinates non-HBM animations during enrollment.

 * Class that coordinates non-HBM animations during enrollment.
@@ -55,9 +53,9 @@ public class UdfpsEnrollViewController extends UdfpsAnimationViewController<Udfp 
            @NonNull UdfpsEnrollView view,

            @NonNull UdfpsEnrollView view,

            @NonNull UdfpsEnrollHelper enrollHelper,

            @NonNull UdfpsEnrollHelper enrollHelper,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull Optional<StatusBar> statusBarOptional,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull DumpManager dumpManager) {

            @NonNull DumpManager dumpManager) {

        super(view, statusBarStateController, statusBarOptional, dumpManager);

        super(view, statusBarStateController, panelExpansionStateManager, dumpManager);

        mEnrollProgressBarRadius = getContext().getResources()

        mEnrollProgressBarRadius = getContext().getResources()

                .getInteger(R.integer.config_udfpsEnrollProgressBar);

                .getInteger(R.integer.config_udfpsEnrollProgressBar);

        mEnrollHelper = enrollHelper;

        mEnrollHelper = enrollHelper;

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -20,9 +20,7 @@ import android.annotation.NonNull; 




import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

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

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

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;



import java.util.Optional;





/**

/**

 * Class that coordinates non-HBM animations for non keyguard, enrollment or biometric prompt

 * Class that coordinates non-HBM animations for non keyguard, enrollment or biometric prompt
@@ -34,9 +32,9 @@ class UdfpsFpmOtherViewController extends UdfpsAnimationViewController<UdfpsFpmO 
    protected UdfpsFpmOtherViewController(

    protected UdfpsFpmOtherViewController(

            @NonNull UdfpsFpmOtherView view,

            @NonNull UdfpsFpmOtherView view,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull StatusBarStateController statusBarStateController,

            @NonNull Optional<StatusBar> statusBarOptional,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull DumpManager dumpManager) {

            @NonNull DumpManager dumpManager) {

        super(view, statusBarStateController, statusBarOptional, dumpManager);

        super(view, statusBarStateController, panelExpansionStateManager, dumpManager);

    }

    }





    @Override

    @Override