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

Commit 49f82e12 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I4c31bc95,Id32432c2,Ibd920f6a,I41f6d0ab into main 

* changes:
  [CS] Remove CentralSurfaces#extendDozePulse.
  [CS] Remove CentralSurfaces#readyForKeyguardDone.
  [CS] Remove CentralSurfaces#isOccluded.
  [CS] Remove CentralSurfaces#isPulsing.
parents 1b66ee9c 88f9020c

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+5 −1
Original line number Diff line number Diff line
@@ -29,12 +29,14 @@ import android.util.Log 
import android.view.WindowManager

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.ActivityIntentHelper

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.settings.UserTracker

import com.android.systemui.shared.system.ActivityManagerKt.isInForeground

import com.android.systemui.statusbar.StatusBarState

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

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

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

import java.util.concurrent.Executor

import javax.inject.Inject
@@ -43,10 +45,12 @@ import javax.inject.Inject 
 * Helps with handling camera-related gestures (for example, double-tap the power button to launch

 * the camera).

 */

@SysUISingleton

class CameraGestureHelper @Inject constructor(

    private val context: Context,

    private val centralSurfaces: CentralSurfaces,

    private val keyguardStateController: KeyguardStateController,

    private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager,

    private val packageManager: PackageManager,

    private val activityManager: ActivityManager,

    private val activityStarter: ActivityStarter,
@@ -133,7 +137,7 @@ class CameraGestureHelper @Inject constructor( 
        centralSurfaces.startLaunchTransitionTimeout()

        // Call this to make sure the keyguard is ready to be dismissed once the next intent is

        // handled by the OS (in our case it is the activity we started right above)

        centralSurfaces.readyForKeyguardDone()

        statusBarKeyguardViewManager.readyForKeyguardDone()

    }



    /**

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

+11 −3
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 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;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;
@@ -118,6 +120,8 @@ public class NotificationShadeWindowViewController { 
    private NotificationStackScrollLayout mStackScrollLayout;

    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;
@@ -152,6 +156,8 @@ public class NotificationShadeWindowViewController { 
            StatusBarWindowStateController statusBarWindowStateController,

            LockIconViewController lockIconViewController,

            CentralSurfaces centralSurfaces,

            DozeServiceHost dozeServiceHost,

            DozeScrimController dozeScrimController,

            BackActionInteractor backActionInteractor,

            PowerInteractor powerInteractor,

            NotificationShadeWindowController controller,
@@ -189,6 +195,8 @@ public class NotificationShadeWindowViewController { 
        mShadeLogger = shadeLogger;

        mLockIconViewController.init();

        mService = centralSurfaces;

        mDozeServiceHost = dozeServiceHost;

        mDozeScrimController = dozeScrimController;

        mPowerInteractor = powerInteractor;

        mNotificationShadeWindowController = controller;

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



                if (mStatusBarStateController.isDozing()) {

                    mService.extendDozePulse();

                    mDozeScrimController.extendPulse();

                }

                mLockIconViewController.onTouchEvent(

                        ev,
@@ -391,7 +399,7 @@ public class NotificationShadeWindowViewController { 


            @Override

            public boolean shouldInterceptTouchEvent(MotionEvent ev) {

                if (mStatusBarStateController.isDozing() && !mService.isPulsing()

                if (mStatusBarStateController.isDozing() && !mDozeServiceHost.isPulsing()

                        && !mDockManager.isDocked()) {

                    if (ev.getAction() == MotionEvent.ACTION_DOWN) {

                        mShadeLogger.d("NSWVC: capture all touch events in always-on");
@@ -445,7 +453,7 @@ public class NotificationShadeWindowViewController { 
            public boolean handleTouchEvent(MotionEvent ev) {

                boolean handled = false;

                if (mStatusBarStateController.isDozing()) {

                    handled = !mService.isPulsing();

                    handled = !mDozeServiceHost.isPulsing();

                }



                if (mStatusBarKeyguardViewManager.onTouch(ev)) {

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

+3 −10
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.Di 
import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

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

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

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

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

import com.android.systemui.statusbar.phone.ScrimController;
@@ -74,6 +73,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.util.Utils;

import com.android.systemui.util.concurrency.DelayableExecutor;



import dagger.Lazy;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.util.ArrayList;
@@ -87,8 +88,6 @@ import java.util.Optional; 
import java.util.Set;

import java.util.stream.Collectors;



import dagger.Lazy;



/**

 * Handles tasks and state related to media notifications. For example, there is a 'current' media

 * notification, which this class keeps track of.
@@ -133,7 +132,6 @@ public class NotificationMediaManager implements Dumpable { 


    private final Context mContext;

    private final ArrayList<MediaListener> mMediaListeners;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final MediaArtworkProcessor mMediaArtworkProcessor;

    private final Set<AsyncTask<?, ?, ?>> mProcessArtworkTasks = new ArraySet<>();
@@ -186,7 +184,6 @@ public class NotificationMediaManager implements Dumpable { 
     */

    public NotificationMediaManager(

            Context context,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Lazy<NotificationShadeWindowController> notificationShadeWindowController,

            NotificationVisibilityProvider visibilityProvider,

            MediaArtworkProcessor mediaArtworkProcessor,
@@ -205,8 +202,6 @@ public class NotificationMediaManager implements Dumpable { 
        mMediaArtworkProcessor = mediaArtworkProcessor;

        mKeyguardBypassController = keyguardBypassController;

        mMediaListeners = new ArrayList<>();

        // TODO: use KeyguardStateController#isOccluded to remove this dependency

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

        mNotificationShadeWindowController = notificationShadeWindowController;

        mVisibilityProvider = visibilityProvider;

        mMainExecutor = mainExecutor;
@@ -619,9 +614,7 @@ public class NotificationMediaManager implements Dumpable { 


        NotificationShadeWindowController windowController =

                mNotificationShadeWindowController.get();

        boolean hideBecauseOccluded =

                mCentralSurfacesOptionalLazy.get()

                        .map(CentralSurfaces::isOccluded).orElse(false);

        boolean hideBecauseOccluded = mKeyguardStateController.isOccluded();



        final boolean hasArtwork = artworkDrawable != null;

        mColorExtractor.setHasMediaArtwork(hasMediaArtwork);

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java

+0 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import com.android.systemui.statusbar.notification.collection.NotifCollection; 
import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

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

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

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

import com.android.systemui.statusbar.phone.ManagedProfileController;
@@ -135,7 +134,6 @@ public interface CentralSurfacesDependenciesModule { 
    @Provides

    static NotificationMediaManager provideNotificationMediaManager(

            Context context,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Lazy<NotificationShadeWindowController> notificationShadeWindowController,

            NotificationVisibilityProvider visibilityProvider,

            MediaArtworkProcessor mediaArtworkProcessor,
@@ -152,7 +150,6 @@ public interface CentralSurfacesDependenciesModule { 
            DisplayManager displayManager) {

        return new NotificationMediaManager(

                context,

                centralSurfacesOptionalLazy,

                notificationShadeWindowController,

                visibilityProvider,

                mediaArtworkProcessor,

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

+0 −8
Original line number Diff line number Diff line
@@ -200,10 +200,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 


    void onKeyguardViewManagerStatesUpdated();



    boolean isPulsing();



    boolean isOccluded();



    boolean isDeviceInVrMode();



    NotificationPresenter getPresenter();
@@ -247,8 +243,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
    @Deprecated

    float getDisplayHeight();



    void readyForKeyguardDone();



    void showKeyguard();



    boolean hideKeyguard();
@@ -370,8 +364,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
    @Deprecated

    float getDisplayDensity();



    void extendDozePulse();



    public static class KeyboardShortcutsMessage {

        final int mDeviceId;