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

Commit d3839140 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge changes from topic "b288868098_delGetSvc" into udc-qpr-dev am: 9cca2318 

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



Change-Id: Iefafd8ba9a7e055fb5e01228360e75684dee1de2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbe62efc 9cca2318

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+5 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.systemui.recents.Recents; 
import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.CentralSurfaces;
@@ -188,6 +189,7 @@ public class SystemActions implements CoreStartable { 
    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final NotificationShadeWindowController mNotificationShadeController;

    private final ShadeController mShadeController;

    private final Lazy<ShadeViewController> mShadeViewController;

    private final StatusBarWindowCallback mNotificationShadeCallback;

    private boolean mDismissNotificationShadeActionRegistered;
@@ -196,12 +198,14 @@ public class SystemActions implements CoreStartable { 
            UserTracker userTracker,

            NotificationShadeWindowController notificationShadeController,

            ShadeController shadeController,

            Lazy<ShadeViewController> shadeViewController,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Optional<Recents> recentsOptional,

            DisplayTracker displayTracker) {

        mContext = context;

        mUserTracker = userTracker;

        mShadeController = shadeController;

        mShadeViewController = shadeViewController;

        mRecentsOptional = recentsOptional;

        mDisplayTracker = displayTracker;

        mReceiver = new SystemActionsBroadcastReceiver();
@@ -330,8 +334,7 @@ public class SystemActions implements CoreStartable { 
        final Optional<CentralSurfaces> centralSurfacesOptional =

                mCentralSurfacesOptionalLazy.get();

        if (centralSurfacesOptional.isPresent()

                && centralSurfacesOptional.get().getShadeViewController() != null

                && centralSurfacesOptional.get().getShadeViewController().isPanelExpanded()

                && mShadeViewController.get().isPanelExpanded()

                && !centralSurfacesOptional.get().isKeyguardShowing()) {

            if (!mDismissNotificationShadeActionRegistered) {

                mA11yManager.registerSystemAction(

packages/SystemUI/src/com/android/systemui/dreams/touch/ShadeTouchHandler.java

+4 −6
Original line number Diff line number Diff line
@@ -37,12 +37,15 @@ import javax.inject.Named; 
 */

public class ShadeTouchHandler implements DreamTouchHandler {

    private final Optional<CentralSurfaces> mSurfaces;

    private final ShadeViewController mShadeViewController;

    private final int mInitiationHeight;



    @Inject

    ShadeTouchHandler(Optional<CentralSurfaces> centralSurfaces,

            ShadeViewController shadeViewController,

            @Named(NOTIFICATION_SHADE_GESTURE_INITIATION_HEIGHT) int initiationHeight) {

        mSurfaces = centralSurfaces;

        mShadeViewController = shadeViewController;

        mInitiationHeight = initiationHeight;

    }
@@ -54,12 +57,7 @@ public class ShadeTouchHandler implements DreamTouchHandler { 
        }



        session.registerInputListener(ev -> {

            final ShadeViewController viewController =

                    mSurfaces.map(CentralSurfaces::getShadeViewController).orElse(null);



            if (viewController != null) {

                viewController.handleExternalTouch((MotionEvent) ev);

            }

            mShadeViewController.handleExternalTouch((MotionEvent) ev);



            if (ev instanceof MotionEvent) {

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

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+10 −6
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ import com.android.systemui.settings.DisplayTracker; 
import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.shared.navigationbar.RegionSamplingHelper;

import com.android.systemui.shared.recents.utilities.Utilities;

import com.android.systemui.shared.rotation.RotationButton;
@@ -199,6 +200,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    private final SysUiState mSysUiFlagsContainer;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final ShadeController mShadeController;

    private final ShadeViewController mShadeViewController;

    private final NotificationRemoteInputManager mNotificationRemoteInputManager;

    private final OverviewProxyService mOverviewProxyService;

    private final NavigationModeController mNavigationModeController;
@@ -523,6 +525,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    @Inject

    NavigationBar(

            NavigationBarView navigationBarView,

            ShadeController shadeController,

            NavigationBarFrame navigationBarFrame,

            @Nullable Bundle savedState,

            @DisplayId Context context,
@@ -541,7 +544,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
            Optional<Pip> pipOptional,

            Optional<Recents> recentsOptional,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            ShadeController shadeController,

            ShadeViewController shadeViewController,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationShadeDepthController notificationShadeDepthController,

            @Main Handler mainHandler,
@@ -577,6 +580,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        mSysUiFlagsContainer = sysUiFlagsContainer;

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

        mShadeController = shadeController;

        mShadeViewController = shadeViewController;

        mNotificationRemoteInputManager = notificationRemoteInputManager;

        mOverviewProxyService = overviewProxyService;

        mNavigationModeController = navigationModeController;
@@ -739,8 +743,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        final Display display = mView.getDisplay();

        mView.setComponents(mRecentsOptional);

        if (mCentralSurfacesOptionalLazy.get().isPresent()) {

            mView.setComponents(

                    mCentralSurfacesOptionalLazy.get().get().getShadeViewController());

            mView.setComponents(mShadeViewController);

        }

        mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);

        mView.setOnVerticalChangedListener(this::onVerticalChanged);
@@ -1341,9 +1344,10 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    }



    private void onVerticalChanged(boolean isVertical) {

        Optional<CentralSurfaces> cs = mCentralSurfacesOptionalLazy.get();

        if (cs.isPresent() && cs.get().getShadeViewController() != null) {

            cs.get().getShadeViewController().setQsScrimEnabled(!isVertical);

        // This check can probably be safely removed. It only remained to reduce regression

        // risk for a broad change that removed the CentralSurfaces reference in the if block

        if (mCentralSurfacesOptionalLazy.get().isPresent()) {

            mShadeViewController.setQsScrimEnabled(!isVertical);

        }

    }

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+9 −15
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.app.AssistUtils;

import com.android.internal.app.IVoiceInteractionSessionListener;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.internal.util.ScreenshotHelper;

import com.android.internal.util.ScreenshotRequest;

import com.android.systemui.Dumpable;
@@ -143,6 +142,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
    private final Executor mMainExecutor;

    private final ShellInterface mShellInterface;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final Lazy<ShadeViewController> mShadeViewControllerLazy;

    private SysUiState mSysUiState;

    private final Handler mHandler;

    private final Lazy<NavigationBarController> mNavBarControllerLazy;
@@ -201,11 +201,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
                // TODO move this logic to message queue

                mCentralSurfacesOptionalLazy.get().ifPresent(centralSurfaces -> {

                    if (event.getActionMasked() == ACTION_DOWN) {

                        ShadeViewController shadeViewController =

                                centralSurfaces.getShadeViewController();

                        if (shadeViewController != null) {

                            shadeViewController.startExpandLatencyTracking();

                        }

                        mShadeViewControllerLazy.get().startExpandLatencyTracking();

                    }

                    mHandler.post(() -> {

                        int action = event.getActionMasked();
@@ -552,8 +548,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
            ShellInterface shellInterface,

            Lazy<NavigationBarController> navBarControllerLazy,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Lazy<ShadeViewController> shadeViewControllerLazy,

            NavigationModeController navModeController,

            NotificationShadeWindowController statusBarWinController, SysUiState sysUiState,

            NotificationShadeWindowController statusBarWinController,

            SysUiState sysUiState,

            UserTracker userTracker,

            ScreenLifecycle screenLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,
@@ -573,6 +571,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        mMainExecutor = mainExecutor;

        mShellInterface = shellInterface;

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

        mShadeViewControllerLazy = shadeViewControllerLazy;

        mHandler = new Handler();

        mNavBarControllerLazy = navBarControllerLazy;

        mStatusBarWinController = statusBarWinController;
@@ -677,13 +676,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
                mNavBarControllerLazy.get().getDefaultNavigationBar();

        final NavigationBarView navBarView =

                mNavBarControllerLazy.get().getNavigationBarView(mContext.getDisplayId());

        final ShadeViewController panelController =

                mCentralSurfacesOptionalLazy.get()

                        .map(CentralSurfaces::getShadeViewController)

                        .orElse(null);

        if (SysUiState.DEBUG) {

            Log.d(TAG_OPS, "Updating sysui state flags: navBarFragment=" + navBarFragment

                    + " navBarView=" + navBarView + " panelController=" + panelController);

                    + " navBarView=" + navBarView

                    + " shadeViewController=" + mShadeViewControllerLazy.get());

        }



        if (navBarFragment != null) {
@@ -692,9 +688,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        if (navBarView != null) {

            navBarView.updateDisabledSystemUiStateFlags(mSysUiState);

        }

        if (panelController != null) {

            panelController.updateSystemUiStateFlags();

        }

        mShadeViewControllerLazy.get().updateSystemUiStateFlags();

        if (mStatusBarWinController != null) {

            mStatusBarWinController.notifyStateChangedCallbacks();

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.plugins.ActivityStarter.OnDismissAction

import com.android.systemui.settings.UserTracker

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.ShadeViewController

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.SysuiStatusBarStateController
@@ -69,6 +70,7 @@ constructor( 
    private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController>,

    private val keyguardViewMediatorLazy: Lazy<KeyguardViewMediator>,

    private val shadeControllerLazy: Lazy<ShadeController>,

    private val shadeViewControllerLazy: Lazy<ShadeViewController>,

    private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>,

    private val notifShadeWindowControllerLazy: Lazy<NotificationShadeWindowController>,

    private val activityLaunchAnimator: ActivityLaunchAnimator,
@@ -896,7 +898,7 @@ constructor( 
                if (dismissShade) {

                    return StatusBarLaunchAnimatorController(

                        animationController,

                        it.shadeViewController,

                        shadeViewControllerLazy.get(),

                        shadeControllerLazy.get(),

                        notifShadeWindowControllerLazy.get(),

                        isLaunchForActivity