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

Commit 1f12daa2 authored by Justin Weir's avatar Justin Weir
Browse files

Remove calls to CentralSurfacesImpl.getNotificationShadeWindowView 

Bug: 284332422
Test: manual
Test: run and fix affected unit tests
Change-Id: I7b11b1a0fbdb1bbcc27ad7a79f61b77c0f9c56d6
parent d3ac130d

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+4 −4
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public void onStartedWakingUp() {

        mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController()

        mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()

                .setAnimationsDisabled(false);

        NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();

        if (navBarView != null) {
@@ -764,7 +764,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public void onStartedGoingToSleep() {

        mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController()

        mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()

                .setAnimationsDisabled(true);

        NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();

        if (navBarView != null) {
@@ -1114,7 +1114,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            if (view != null) {

                view.setVisibility(View.VISIBLE);

            }

            mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController()

            mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()

                    .show(navigationBars());

        }

    };
@@ -1192,7 +1192,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                }

            } else {

                mNotificationContainer.removeCallbacks(mMakeNavigationBarVisibleRunnable);

                mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController()

                mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()

                        .hide(navigationBars());

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator 
import com.android.systemui.keyguard.WakefulnessLifecycle

import com.android.systemui.statusbar.CircleReveal

import com.android.systemui.statusbar.LightRevealScrim

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.StatusBarStateControllerImpl

import com.android.systemui.statusbar.notification.AnimatableProperty
@@ -60,6 +61,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
    private val keyguardStateController: KeyguardStateController,

    private val dozeParameters: dagger.Lazy<DozeParameters>,

    private val globalSettings: GlobalSettings,

    private val notifShadeWindowControllerLazy: dagger.Lazy<NotificationShadeWindowController>,

    private val interactionJankMonitor: InteractionJankMonitor,

    private val powerManager: PowerManager,

    private val handler: Handler = Handler()
@@ -114,7 +116,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( 


            override fun onAnimationStart(animation: Animator?) {

                interactionJankMonitor.begin(

                    mCentralSurfaces.notificationShadeWindowView, CUJ_SCREEN_OFF)

                        notifShadeWindowControllerLazy.get().windowRootView, CUJ_SCREEN_OFF)

            }

        })

    }
@@ -218,7 +220,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
                .setCustomInterpolator(View.ALPHA, Interpolators.FAST_OUT_SLOW_IN),

            true /* animate */)

        interactionJankMonitor.begin(

            mCentralSurfaces.notificationShadeWindowView,

                notifShadeWindowControllerLazy.get().windowRootView,

            CUJ_SCREEN_OFF_SHOW_AOD

        )

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    @Mock private BouncerView mBouncerView;

    @Mock private BouncerViewDelegate mBouncerViewDelegate;

    @Mock private OnBackAnimationCallback mBouncerViewDelegateBackCallback;

    @Mock private NotificationShadeWindowController mNotificationShadeWindowController;

    @Mock private NotificationShadeWindowView mNotificationShadeWindowView;

    @Mock private WindowInsetsController mWindowInsetsController;

    @Mock private TaskbarDelegate mTaskbarDelegate;
@@ -168,7 +169,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
                .isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_BOUNCER_ANIM))

                .thenReturn(true);



        when(mCentralSurfaces.getNotificationShadeWindowView())

        when(mNotificationShadeWindowController.getWindowRootView())

                .thenReturn(mNotificationShadeWindowView);

        when(mNotificationShadeWindowView.getWindowInsetsController())

                .thenReturn(mWindowInsetsController);
@@ -184,7 +185,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
                        mDreamOverlayStateController,

                        mock(NavigationModeController.class),

                        mock(DockManager.class),

                        mock(NotificationShadeWindowController.class),

                        mNotificationShadeWindowController,

                        mKeyguardStateController,

                        mock(NotificationMediaManager.class),

                        mKeyguardMessageAreaFactory,

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationControllerTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator 
import com.android.systemui.keyguard.WakefulnessLifecycle

import com.android.systemui.shade.ShadeViewController

import com.android.systemui.statusbar.LightRevealScrim

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.StatusBarStateControllerImpl

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

import com.android.systemui.util.mockito.eq
@@ -65,6 +66,8 @@ class UnlockedScreenOffAnimationControllerTest : SysuiTestCase() { 
    @Mock

    private lateinit var shadeViewController: ShadeViewController

    @Mock

    private lateinit var notifShadeWindowController: NotificationShadeWindowController

    @Mock

    private lateinit var lightRevealScrim: LightRevealScrim

    @Mock

    private lateinit var wakefulnessLifecycle: WakefulnessLifecycle
@@ -89,6 +92,7 @@ class UnlockedScreenOffAnimationControllerTest : SysuiTestCase() { 
                keyguardStateController,

                dagger.Lazy<DozeParameters> { dozeParameters },

                globalSettings,

                dagger.Lazy<NotificationShadeWindowController> { notifShadeWindowController },

                interactionJankMonitor,

                powerManager,

                handler = handler