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

Commit 37bf7aba authored by Justin Weir's avatar Justin Weir
Browse files

Make NotificationShadeWindowViewController a Dumpable 

Previously CentralSurfacesImpl called its dump method. It should
register itself and remove this dependency.

Bug: 277764509
Test: Manually confirmed it dumps
Change-Id: I76224aa7c04c8e07eecbc219252002c8c716633e
parent 2e794c17

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

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.keyguard.AuthKeyguardMessageArea; 
import com.android.keyguard.KeyguardMessageAreaController;

import com.android.keyguard.LockIconViewController;

import com.android.keyguard.dagger.KeyguardBouncerComponent;

import com.android.systemui.Dumpable;

import com.android.systemui.R;

import com.android.systemui.back.domain.interactor.BackActionInteractor;

import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor;
@@ -43,6 +44,7 @@ import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel; 
import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyevent.domain.interactor.KeyEventInteractor;
@@ -83,7 +85,7 @@ import javax.inject.Inject; 
 * Controller for {@link NotificationShadeWindowView}.

 */

@SysUISingleton

public class NotificationShadeWindowViewController {

public class NotificationShadeWindowViewController implements Dumpable {

    private static final String TAG = "NotifShadeWindowVC";

    private final FalsingCollector mFalsingCollector;

    private final SysuiStatusBarStateController mStatusBarStateController;
@@ -166,6 +168,7 @@ public class NotificationShadeWindowViewController { 
            NotificationInsetsController notificationInsetsController,

            AmbientState ambientState,

            ShadeLogger shadeLogger,

            DumpManager dumpManager,

            PulsingGestureListener pulsingGestureListener,

            LockscreenHostedDreamGestureListener lockscreenHostedDreamGestureListener,

            KeyguardBouncerViewModel keyguardBouncerViewModel,
@@ -235,6 +238,7 @@ public class NotificationShadeWindowViewController { 
        }



        lockIconViewController.setLockIconView(mView.findViewById(R.id.lock_icon_view));

        dumpManager.registerDumpable(this);

    }



    /**
@@ -542,6 +546,7 @@ public class NotificationShadeWindowViewController { 
        mAmbientState.setSwipingUp(false);

    }



    @Override

    public void dump(PrintWriter pw, String[] args) {

        pw.print("  mExpandAnimationRunning=");

        pw.println(mExpandAnimationRunning);

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

+0 −2
Original line number Diff line number Diff line
@@ -1947,8 +1947,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        pw.print("  mDozing="); pw.println(mDozing);

        pw.print("  mWallpaperSupported= "); pw.println(mWallpaperSupported);



        pw.println("  ShadeWindowView: ");

        getNotificationShadeWindowViewController().dump(pw, args);

        CentralSurfaces.dumpBarTransitions(

                pw, "PhoneStatusBarTransitions", mStatusBarTransitions);

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

+45 −42
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.bouncer.domain.interactor.CountDownTimerUtil 
import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel

import com.android.systemui.classifier.FalsingCollectorFake

import com.android.systemui.dock.DockManager

import com.android.systemui.dump.DumpManager

import com.android.systemui.dump.logcatLogBuffer

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.flags.Flags
@@ -102,6 +103,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { 
    @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController

    @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController

    @Mock private lateinit var shadeLogger: ShadeLogger

    @Mock private lateinit var dumpManager: DumpManager

    @Mock private lateinit var ambientState: AmbientState

    @Mock private lateinit var keyguardBouncerViewModel: KeyguardBouncerViewModel

    @Mock private lateinit var stackScrollLayoutController: NotificationStackScrollLayoutController
@@ -182,6 +184,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { 
                notificationInsetsController,

                ambientState,

                shadeLogger,

                dumpManager,

                pulsingGestureListener,

                mLockscreenHostedDreamGestureListener,

                keyguardBouncerViewModel,

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

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.bouncer.domain.interactor.CountDownTimerUtil 
import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel

import com.android.systemui.classifier.FalsingCollectorFake

import com.android.systemui.dock.DockManager

import com.android.systemui.dump.DumpManager

import com.android.systemui.dump.logcatLogBuffer

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.flags.Flags
@@ -111,6 +112,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
    @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController

    @Mock private lateinit var ambientState: AmbientState

    @Mock private lateinit var shadeLogger: ShadeLogger

    @Mock private lateinit var dumpManager: DumpManager

    @Mock private lateinit var pulsingGestureListener: PulsingGestureListener

    @Mock

    private lateinit var mLockscreenHostedDreamGestureListener: LockscreenHostedDreamGestureListener
@@ -188,6 +190,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
                notificationInsetsController,

                ambientState,

                shadeLogger,

                dumpManager,

                pulsingGestureListener,

                mLockscreenHostedDreamGestureListener,

                keyguardBouncerViewModel,