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

Commit 923005c3 authored by Steve Elliott's avatar Steve Elliott
Browse files

Move NotifShelf click handling to Interactor 

Bug: 271161129
Test: atest SystemUITests
Change-Id: Ida316c14ed504d0d3bdb1f26a1867c6310fd30dd
parent 6e20c37a

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

+2 −2
Original line number Diff line number Diff line
@@ -3333,12 +3333,12 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


        mGestureRecorder = recorder;

        mHideExpandedRunnable = hideExpandedRunnable;

        mNotificationShelfController = notificationShelfController;

        if (!mFeatureFlags.isEnabled(Flags.NOTIFICATION_SHELF_REFACTOR)) {

            mNotificationStackScrollLayoutController.setShelfController(

                    notificationShelfController);

        }

        mNotificationShelfController = notificationShelfController;

            mLockscreenShadeTransitionController.bindController(notificationShelfController);

        }

        updateMaxDisplayedNotifications(true);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ public class NotificationShadeWindowViewController { 
                            mService.userActivity();

                            mService.wakeUpIfDozing(

                                    mClock.uptimeMillis(),

                                    mView,

                                    "LOCK_ICON_TOUCH",

                                    PowerManager.WAKE_REASON_GESTURE);

                        }

packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt

+0 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ class PulsingGestureListener @Inject constructor( 
                shadeLogger.d("Single tap handled, requesting centralSurfaces.wakeUpIfDozing")

                centralSurfaces.wakeUpIfDozing(

                    SystemClock.uptimeMillis(),

                    notificationShadeWindowView,

                    "PULSING_SINGLE_TAP",

                    PowerManager.WAKE_REASON_TAP

                )
@@ -116,7 +115,6 @@ class PulsingGestureListener @Inject constructor( 
        ) {

            centralSurfaces.wakeUpIfDozing(

                    SystemClock.uptimeMillis(),

                    notificationShadeWindowView,

                    "PULSING_DOUBLE_TAP",

                    PowerManager.WAKE_REASON_TAP

            )

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ class LockscreenShadeTransitionController @Inject constructor( 
            if (statusBarStateController.state == StatusBarState.KEYGUARD) {

                centralSurfaces.wakeUpIfDozing(

                        SystemClock.uptimeMillis(),

                        it,

                        "SHADE_CLICK",

                        PowerManager.WAKE_REASON_GESTURE,

                )

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
                View view, PendingIntent pendingIntent, RemoteViews.RemoteResponse response) {

            mCentralSurfacesOptionalLazy.get().ifPresent(

                    centralSurfaces -> centralSurfaces.wakeUpIfDozing(

                            SystemClock.uptimeMillis(), view, "NOTIFICATION_CLICK",

                            SystemClock.uptimeMillis(), "NOTIFICATION_CLICK",

                            PowerManager.WAKE_REASON_GESTURE));



            final NotificationEntry entry = getNotificationForParent(view.getParent());