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

Commit 1d7408c1 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

[Central Surfaces] Move SBNotifPresenter wake to PowerInteractor. am: 0dfd9110 am: 7573e966 

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



Change-Id: Iffd29413642ea1b09dfc19b30927e3e17f703d0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da37e0ac 7573e966

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

+5 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Context; 
import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.service.notification.StatusBarNotification;

import android.service.vr.IVrManager;

import android.service.vr.IVrStateCallbacks;
@@ -36,6 +35,7 @@ import com.android.systemui.InitController; 
import com.android.systemui.R;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.QuickSettingsController;

import com.android.systemui.shade.ShadeViewController;
@@ -86,6 +86,7 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu 
    private final CentralSurfaces mCentralSurfaces;

    private final NotificationsInteractor mNotificationsInteractor;

    private final LockscreenShadeTransitionController mShadeTransitionController;

    private final PowerInteractor mPowerInteractor;

    private final CommandQueue mCommandQueue;



    private final AccessibilityManager mAccessibilityManager;
@@ -115,6 +116,7 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu 
            CentralSurfaces centralSurfaces,

            NotificationsInteractor notificationsInteractor,

            LockscreenShadeTransitionController shadeTransitionController,

            PowerInteractor powerInteractor,

            CommandQueue commandQueue,

            NotificationLockscreenUserManager lockscreenUserManager,

            SysuiStatusBarStateController sysuiStatusBarStateController,
@@ -138,6 +140,7 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu 
        mCentralSurfaces = centralSurfaces;

        mNotificationsInteractor = notificationsInteractor;

        mShadeTransitionController = shadeTransitionController;

        mPowerInteractor = powerInteractor;

        mCommandQueue = commandQueue;

        mLockscreenUserManager = lockscreenUserManager;

        mStatusBarStateController = sysuiStatusBarStateController;
@@ -238,9 +241,7 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu 
    public void onExpandClicked(NotificationEntry clickedEntry, View clickedView,

            boolean nowExpanded) {

        mHeadsUpManager.setExpanded(clickedEntry, nowExpanded);

        mCentralSurfaces.wakeUpIfDozing(

                SystemClock.uptimeMillis(), "NOTIFICATION_CLICK",

                PowerManager.WAKE_REASON_GESTURE);

        mPowerInteractor.wakeUpIfDozing("NOTIFICATION_CLICK", PowerManager.WAKE_REASON_GESTURE);

        if (nowExpanded) {

            if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {

                mShadeTransitionController.goToLockedShade(clickedEntry.getRow());

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.systemui.InitController; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.plugins.ActivityStarter;

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

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.settings.FakeDisplayTracker;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.QuickSettingsController;
@@ -127,6 +128,7 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { 
                mCentralSurfaces,

                mNotificationsInteractor,

                mock(LockscreenShadeTransitionController.class),

                mock(PowerInteractor.class),

                mCommandQueue,

                mock(NotificationLockscreenUserManager.class),

                mock(SysuiStatusBarStateController.class),