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

Commit e0a8b1cb authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge changes from topic "b229228871-cs-interface" into tm-dev am: 44217582 am: caf20448 

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



Change-Id: I9242bbf66671ac5629b94affac33e56f5ad0b5c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3aea4700 caf20448

packages/SystemUI/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


-keep class com.android.systemui.recents.OverviewProxyRecentsImpl

-keep class com.android.systemui.statusbar.car.CarStatusBar

-keep class com.android.systemui.statusbar.phone.CentralSurfacesInt

-keep class com.android.systemui.statusbar.phone.CentralSurfaces

-keep class com.android.systemui.statusbar.tv.TvStatusBar

-keep class com.android.systemui.car.CarSystemUIFactory

-keep class com.android.systemui.SystemUIFactory

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable; 


import com.android.systemui.keyguard.KeyguardViewMediator;

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

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

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

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

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

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;
@@ -183,7 +183,7 @@ public interface KeyguardViewController { 
    /**

     * Registers the CentralSurfaces to which this Keyguard View is mounted.

     */

    void registerCentralSurfaces(CentralSurfacesInt centralSurfaces,

    void registerCentralSurfaces(CentralSurfaces centralSurfaces,

            NotificationPanelViewController notificationPanelViewController,

            @Nullable PanelExpansionStateManager panelExpansionStateManager,

            BiometricUnlockController biometricUnlockController,

packages/SystemUI/src/com/android/systemui/ActivityStarterDelegate.java

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable; 
import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.plugins.ActivityStarter;

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

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



import java.util.Optional;
@@ -40,10 +40,10 @@ import dagger.Lazy; 
@SysUISingleton

public class ActivityStarterDelegate implements ActivityStarter {



    private Lazy<Optional<CentralSurfacesInt>> mActualStarterOptionalLazy;

    private Lazy<Optional<CentralSurfaces>> mActualStarterOptionalLazy;



    @Inject

    public ActivityStarterDelegate(Lazy<Optional<CentralSurfacesInt>> centralSurfacesOptionalLazy) {

    public ActivityStarterDelegate(Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy) {

        mActualStarterOptionalLazy = centralSurfacesOptionalLazy;

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.recents.Recents;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeWindowController;

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

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

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

import com.android.systemui.util.Assert;
@@ -180,7 +180,7 @@ public class SystemActions extends CoreStartable { 
    private final Optional<Recents> mRecentsOptional;

    private Locale mLocale;

    private final AccessibilityManager mA11yManager;

    private final Lazy<Optional<CentralSurfacesInt>> mCentralSurfacesOptionalLazy;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final NotificationShadeWindowController mNotificationShadeController;

    private final StatusBarWindowCallback mNotificationShadeCallback;

    private boolean mDismissNotificationShadeActionRegistered;
@@ -188,7 +188,7 @@ public class SystemActions extends CoreStartable { 
    @Inject

    public SystemActions(Context context,

            NotificationShadeWindowController notificationShadeController,

            Lazy<Optional<CentralSurfacesInt>> centralSurfacesOptionalLazy,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Optional<Recents> recentsOptional) {

        super(context);

        mRecentsOptional = recentsOptional;
@@ -311,9 +311,9 @@ public class SystemActions extends CoreStartable { 


        // Saving state in instance variable since this callback is called quite often to avoid

        // binder calls

        final Optional<CentralSurfacesInt> centralSurfacesOptional =

        final Optional<CentralSurfaces> centralSurfacesOptional =

                mCentralSurfacesOptionalLazy.get();

        if (centralSurfacesOptional.map(CentralSurfacesInt::isPanelExpanded).orElse(false)

        if (centralSurfacesOptional.map(CentralSurfaces::isPanelExpanded).orElse(false)

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

            if (!mDismissNotificationShadeActionRegistered) {

                mA11yManager.registerSystemAction(
@@ -467,7 +467,7 @@ public class SystemActions extends CoreStartable { 
    }



    private void handleNotifications() {

        mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfacesInt::animateExpandNotificationsPanel);

        mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::animateExpandNotificationsPanel);

    }



    private void handleQuickSettings() {

packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.shared.system.PackageManagerWrapper; 
import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;

import com.android.systemui.statusbar.StatusBarState;

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

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



import java.util.ArrayList;

import java.util.List;
@@ -69,7 +69,7 @@ public final class PhoneStateMonitor { 
    };



    private final Context mContext;

    private final Lazy<Optional<CentralSurfacesInt>> mCentralSurfacesOptionalLazy;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final StatusBarStateController mStatusBarStateController;



    private boolean mLauncherShowing;
@@ -77,7 +77,7 @@ public final class PhoneStateMonitor { 


    @Inject

    PhoneStateMonitor(Context context, BroadcastDispatcher broadcastDispatcher,

            Lazy<Optional<CentralSurfacesInt>> centralSurfacesOptionalLazy,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            BootCompleteCache bootCompleteCache,

            StatusBarStateController statusBarStateController) {

        mContext = context;
@@ -182,7 +182,7 @@ public final class PhoneStateMonitor { 


    private boolean isBouncerShowing() {

        return mCentralSurfacesOptionalLazy.get()

                .map(CentralSurfacesInt::isBouncerShowing).orElse(false);

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

    }



    private boolean isKeyguardLocked() {