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

Commit 2850dd6b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensuring QS can't collapse (hide) in split shade" into tm-qpr-dev am: 898d6d91 

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



Change-Id: Ie025afc7479ea9d77a3c3d6ffceea2005942b10c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 075c80a0 898d6d91

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

+12 −2
Original line number Diff line number Diff line
@@ -2097,7 +2097,17 @@ public final class NotificationPanelViewController implements Dumpable { 
        }

    }



    public void expandWithoutQs() {

    /**

     * Expand shade so that notifications are visible.

     * Non-split shade: just expanding shade or collapsing QS when they're expanded.

     * Split shade: only expanding shade, notifications are always visible

     *

     * Called when `adb shell cmd statusbar expand-notifications` is executed.

     */

    public void expandShadeToNotifications() {

        if (mSplitShadeEnabled && (isShadeFullyOpen() || isExpanding())) {

            return;

        }

        if (isQsExpanded()) {

            flingSettings(0 /* velocity */, FLING_COLLAPSE);

        } else {
@@ -5536,7 +5546,7 @@ public final class NotificationPanelViewController implements Dumpable { 


        @Override

        public void flingTopOverscroll(float velocity, boolean open) {

            // in split shade mode we want to expand/collapse QS only when touch happens within QS

            // in split shade touches affect QS only when touch happens within QS

            if (isSplitShadeAndTouchXOutsideQs(mInitialTouchX)) {

                return;

            }

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

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

        }



        mNotificationPanelViewController.expandWithoutQs();

        mNotificationPanelViewController.expandShadeToNotifications();

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            if (hideImmediately) {

                mStatusBarStateController.setLeaveOpenOnKeyguardHide(false);

            } else {

                mNotificationPanelViewController.expandWithoutQs();

                mNotificationPanelViewController.expandShadeToNotifications();

            }

        }

        return;

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

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { 


        // Trying to open it does nothing.

        mSbcqCallbacks.animateExpandNotificationsPanel();

        verify(mNotificationPanelViewController, never()).expandWithoutQs();

        verify(mNotificationPanelViewController, never()).expandShadeToNotifications();

        mSbcqCallbacks.animateExpandSettingsPanel(null);

        verify(mNotificationPanelViewController, never()).expand(anyBoolean());

    }
@@ -165,7 +165,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { 


        // Can now be opened.

        mSbcqCallbacks.animateExpandNotificationsPanel();

        verify(mNotificationPanelViewController).expandWithoutQs();

        verify(mNotificationPanelViewController).expandShadeToNotifications();

        mSbcqCallbacks.animateExpandSettingsPanel(null);

        verify(mNotificationPanelViewController).expandWithQs();

    }