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

Commit 9251e4c5 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Moved panel expansion classes to shade package" into tm-qpr-dev am: ed10f73b 

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



Change-Id: I7f28da31471a5aeab854a46f8873dad97073282e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b617ab16 ed10f73b

packages/SystemUI/ktfmt_includes.txt

+2 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallFlags.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelStateListener.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/ShadeStateListener.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserInfoTracker.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt

-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherController.kt
@@ -812,7 +812,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallChronometerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/ShadeExpansionStateManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositoryImplTest.kt

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ import androidx.annotation.Nullable; 


import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.shade.NotificationPanelViewController;

import com.android.systemui.shade.ShadeExpansionStateManager;

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

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

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

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



/**

 *  Interface to control Keyguard View. It should be implemented by KeyguardViewManagers, which
@@ -180,7 +180,7 @@ public interface KeyguardViewController { 
     */

    void registerCentralSurfaces(CentralSurfaces centralSurfaces,

            NotificationPanelViewController notificationPanelViewController,

            @Nullable PanelExpansionStateManager panelExpansionStateManager,

            @Nullable ShadeExpansionStateManager shadeExpansionStateManager,

            BiometricUnlockController biometricUnlockController,

            View notificationContainer,

            KeyguardBypassController bypassController);

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

+6 −6
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import com.android.systemui.Dumpable 
import com.android.systemui.animation.Interpolators

import com.android.systemui.dump.DumpManager

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

import com.android.systemui.shade.ShadeExpansionListener

import com.android.systemui.shade.ShadeExpansionStateManager

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

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

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

import com.android.systemui.util.ViewController

import java.io.PrintWriter
@@ -41,7 +41,7 @@ import java.io.PrintWriter 
abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(

    view: T,

    protected val statusBarStateController: StatusBarStateController,

    protected val panelExpansionStateManager: PanelExpansionStateManager,

    protected val shadeExpansionStateManager: ShadeExpansionStateManager,

    protected val dialogManager: SystemUIDialogManager,

    private val dumpManager: DumpManager

) : ViewController<T>(view), Dumpable {
@@ -54,7 +54,7 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( 
    private var dialogAlphaAnimator: ValueAnimator? = null

    private val dialogListener = SystemUIDialogManager.Listener { runDialogAlphaAnimator() }



    private val panelExpansionListener = PanelExpansionListener { event ->

    private val shadeExpansionListener = ShadeExpansionListener { event ->

        // Notification shade can be expanded but not visible (fraction: 0.0), for example

        // when a heads-up notification (HUN) is showing.

        notificationShadeVisible = event.expanded && event.fraction > 0f
@@ -108,13 +108,13 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( 
    }



    override fun onViewAttached() {

        panelExpansionStateManager.addExpansionListener(panelExpansionListener)

        shadeExpansionStateManager.addExpansionListener(shadeExpansionListener)

        dialogManager.registerListener(dialogListener)

        dumpManager.registerDumpable(dumpTag, this)

    }



    override fun onViewDetached() {

        panelExpansionStateManager.removeExpansionListener(panelExpansionListener)

        shadeExpansionStateManager.removeExpansionListener(shadeExpansionListener)

        dialogManager.unregisterListener(dialogListener)

        dumpManager.unregisterDumpable(dumpTag)

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package com.android.systemui.biometrics 


import com.android.systemui.dump.DumpManager

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

import com.android.systemui.shade.ShadeExpansionStateManager

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

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



/**

 * Class that coordinates non-HBM animations for biometric prompt.
@@ -26,13 +26,13 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManage 
class UdfpsBpViewController(

    view: UdfpsBpView,

    statusBarStateController: StatusBarStateController,

    panelExpansionStateManager: PanelExpansionStateManager,

    shadeExpansionStateManager: ShadeExpansionStateManager,

    systemUIDialogManager: SystemUIDialogManager,

    dumpManager: DumpManager

) : UdfpsAnimationViewController<UdfpsBpView>(

    view,

    statusBarStateController,

    panelExpansionStateManager,

    shadeExpansionStateManager,

    systemUIDialogManager,

    dumpManager

) {

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

+5 −5
Original line number Diff line number Diff line
@@ -63,12 +63,12 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.VibratorHelper;

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

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

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.KeyguardStateController;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -111,7 +111,7 @@ public class UdfpsController implements DozeReceiver { 
    private final WindowManager mWindowManager;

    private final DelayableExecutor mFgExecutor;

    @NonNull private final Executor mBiometricExecutor;

    @NonNull private final PanelExpansionStateManager mPanelExpansionStateManager;

    @NonNull private final ShadeExpansionStateManager mShadeExpansionStateManager;

    @NonNull private final StatusBarStateController mStatusBarStateController;

    @NonNull private final KeyguardStateController mKeyguardStateController;

    @NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
@@ -205,7 +205,7 @@ public class UdfpsController implements DozeReceiver { 
            mFgExecutor.execute(() -> UdfpsController.this.showUdfpsOverlay(

                    new UdfpsControllerOverlay(mContext, mFingerprintManager, mInflater,

                            mWindowManager, mAccessibilityManager, mStatusBarStateController,

                            mPanelExpansionStateManager, mKeyguardViewManager,

                            mShadeExpansionStateManager, mKeyguardViewManager,

                            mKeyguardUpdateMonitor, mDialogManager, mDumpManager,

                            mLockscreenShadeTransitionController, mConfigurationController,

                            mSystemClock, mKeyguardStateController,
@@ -582,7 +582,7 @@ public class UdfpsController implements DozeReceiver { 
            @NonNull WindowManager windowManager,

            @NonNull StatusBarStateController statusBarStateController,

            @Main DelayableExecutor fgExecutor,

            @NonNull PanelExpansionStateManager panelExpansionStateManager,

            @NonNull ShadeExpansionStateManager shadeExpansionStateManager,

            @NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            @NonNull DumpManager dumpManager,

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

        mWindowManager = windowManager;

        mFgExecutor = fgExecutor;

        mPanelExpansionStateManager = panelExpansionStateManager;

        mShadeExpansionStateManager = shadeExpansionStateManager;

        mStatusBarStateController = statusBarStateController;

        mKeyguardStateController = keyguardStateController;

        mKeyguardViewManager = statusBarKeyguardViewManager;