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

Commit 5f7e6fca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove CentralSurfaces.isPanelExpanded" into udc-qpr-dev am: f9af7978 

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



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

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

+3 −1
Original line number Diff line number Diff line
@@ -329,7 +329,9 @@ public class SystemActions implements CoreStartable { 
        // binder calls

        final Optional<CentralSurfaces> centralSurfacesOptional =

                mCentralSurfacesOptionalLazy.get();

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

        if (centralSurfacesOptional.isPresent()

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

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

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

            if (!mDismissNotificationShadeActionRegistered) {

                mA11yManager.registerSystemAction(

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

+3 −2
Original line number Diff line number Diff line
@@ -2440,6 +2440,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown;

        if (mPanelExpanded != isExpanded) {

            mPanelExpanded = isExpanded;

            updateSystemUiStateFlags();

            mShadeExpansionStateManager.onShadeExpansionFullyChanged(isExpanded);

            if (!isExpanded) {

                mQsController.closeQsCustomizer();
@@ -2447,6 +2448,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        }

    }



    @Override

    public boolean isPanelExpanded() {

        return mPanelExpanded;

    }
@@ -3440,9 +3442,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            Log.d(TAG, "Updating panel sysui state flags: fullyExpanded="

                    + isFullyExpanded() + " inQs=" + mQsController.getExpanded());

        }

        boolean isPanelVisible = mCentralSurfaces != null && mCentralSurfaces.isPanelExpanded();

        mSysUiState

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelVisible)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, mPanelExpanded)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

                        isFullyExpanded() && !mQsController.getExpanded())

                .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED,

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ interface ShadeViewController { 
     * Returns whether the shade height is greater than zero or the shade is expecting a synthesized

     * down event.

     */

    @get:Deprecated("use {@link #isExpanded()} instead") val isPanelExpanded: Boolean

    val isPanelExpanded: Boolean



    /** Returns whether the shade is fully expanded in either QS or QQS. */

    val isShadeFullyExpanded: Boolean

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

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


    NotificationPresenter getPresenter();



    boolean isPanelExpanded();



    /**

     * Used to dispatch initial touch events before crossing the threshold to pull down the

     * notification shade. After that, since the launcher window is set to slippery, input

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

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 


    @Override

    public void togglePanel() {

        if (mCentralSurfaces.isPanelExpanded()) {

        if (mShadeViewController.isPanelExpanded()) {

            mShadeController.animateCollapseShade();

        } else {

            mShadeController.animateExpandShade();