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

Commit 88f9020c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove CentralSurfaces#extendDozePulse. 

Have NotificationShadeWindowViewController notify DozeScrimController
directly instead.

Bug: 277764509
Test: tap on AOD -> verified via logging that shade window controller
notified doze scrim controller to extend pulse
Test: atest NotificationShadeWindowViewTest
NotificationShadeWindowViewControllerTest

Change-Id: I4c31bc953cb3af018a4569b5d0a7109d05bc6c7c
parent e5af17ae

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java

+5 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.systemui.statusbar.notification.stack.AmbientState; 
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -120,6 +121,7 @@ public class NotificationShadeWindowViewController { 
    private PhoneStatusBarViewController mStatusBarViewController;

    private final CentralSurfaces mService;

    private final DozeServiceHost mDozeServiceHost;

    private final DozeScrimController mDozeScrimController;

    private final BackActionInteractor mBackActionInteractor;

    private final PowerInteractor mPowerInteractor;

    private final NotificationShadeWindowController mNotificationShadeWindowController;
@@ -155,6 +157,7 @@ public class NotificationShadeWindowViewController { 
            LockIconViewController lockIconViewController,

            CentralSurfaces centralSurfaces,

            DozeServiceHost dozeServiceHost,

            DozeScrimController dozeScrimController,

            BackActionInteractor backActionInteractor,

            PowerInteractor powerInteractor,

            NotificationShadeWindowController controller,
@@ -193,6 +196,7 @@ public class NotificationShadeWindowViewController { 
        mLockIconViewController.init();

        mService = centralSurfaces;

        mDozeServiceHost = dozeServiceHost;

        mDozeScrimController = dozeScrimController;

        mPowerInteractor = powerInteractor;

        mNotificationShadeWindowController = controller;

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
@@ -336,7 +340,7 @@ public class NotificationShadeWindowViewController { 
                }



                if (mStatusBarStateController.isDozing()) {

                    mService.extendDozePulse();

                    mDozeScrimController.extendPulse();

                }

                mLockIconViewController.onTouchEvent(

                        ev,

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

+0 −2
Original line number Diff line number Diff line
@@ -364,8 +364,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
    @Deprecated

    float getDisplayDensity();



    void extendDozePulse();



    public static class KeyboardShortcutsMessage {

        final int mDeviceId;

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

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces { 
    override fun setLaunchEmergencyActionOnFinishedWaking(launch: Boolean) {}

    override fun getQSPanelController(): QSPanelController? = null

    override fun getDisplayDensity() = 0f

    override fun extendDozePulse() {}

    override fun setIsLaunchingActivityOverLockscreen(isLaunchingActivityOverLockscreen: Boolean) {}

    override fun getAnimatorControllerFromNotification(

        associatedView: ExpandableNotificationRow?,

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

+0 −5
Original line number Diff line number Diff line
@@ -3383,11 +3383,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        }

    }



    @Override

    public void extendDozePulse(){

        mDozeScrimController.extendPulse();

    }



    private final KeyguardUpdateMonitorCallback mUpdateCallback =

            new KeyguardUpdateMonitorCallback() {

                @Override

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.statusbar.notification.data.repository.NotificationE 
import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

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

import com.android.systemui.statusbar.phone.DozeScrimController

import com.android.systemui.statusbar.phone.DozeServiceHost

import com.android.systemui.statusbar.phone.PhoneStatusBarViewController

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
@@ -92,6 +93,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { 
    @Mock private lateinit var sysuiStatusBarStateController: SysuiStatusBarStateController

    @Mock private lateinit var centralSurfaces: CentralSurfaces

    @Mock private lateinit var dozeServiceHost: DozeServiceHost

    @Mock private lateinit var dozeScrimController: DozeScrimController

    @Mock private lateinit var backActionInteractor: BackActionInteractor

    @Mock private lateinit var powerInteractor: PowerInteractor

    @Mock private lateinit var dockManager: DockManager
@@ -171,6 +173,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { 
                    lockIconViewController,

                    centralSurfaces,

                    dozeServiceHost,

                    dozeScrimController,

                    backActionInteractor,

                    powerInteractor,

                    notificationShadeWindowController,