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

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

Merge "Fixing not responsive tiles in split shade" into tm-dev am: 608ff044 am: 606b0200 

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



Change-Id: I5d74f2e87d1a8380645f6be7717964f78877fbf2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42f57455 606b0200

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

+4 −7
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ public class NotificationPanelViewController extends PanelViewController { 
     * Determines if QS should be already expanded when expanding shade.

     * Used for split shade, two finger gesture as well as accessibility shortcut to QS.

     */

    private boolean mQsExpandImmediate;

    @VisibleForTesting boolean mQsExpandImmediate;

    private boolean mTwoFingerQsExpandPossible;

    private String mHeaderDebugInfo;
@@ -430,7 +430,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private boolean mExpandingFromHeadsUp;

    private boolean mCollapsedOnDown;

    private int mPositionMinSideMargin;

    private int mLastOrientation = -1;

    private boolean mClosingWithAlphaFadeOut;

    private boolean mHeadsUpAnimatingAway;

    private boolean mLaunchingAffordance;
@@ -955,7 +954,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area);

        mPreviewContainer = mView.findViewById(R.id.preview_container);

        mKeyguardBottomArea.setPreviewContainer(mPreviewContainer);

        mLastOrientation = mResources.getConfiguration().orientation;



        initBottomArea();
@@ -1994,9 +1992,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (!isFullyCollapsed()) {

            return;

        }

        if (mShouldUseSplitNotificationShade) {

            mQsExpandImmediate = true;

        }

        mExpectingSynthesizedDown = true;

        onTrackingStarted();

        updatePanelExpanded();
@@ -3172,6 +3167,9 @@ public class NotificationPanelViewController extends PanelViewController { 
        mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen());

        super.onTrackingStarted();

        mScrimController.onTrackingStarted();

        if (mShouldUseSplitNotificationShade) {

            mQsExpandImmediate = true;

        }

        if (mQsFullyExpanded) {

            mQsExpandImmediate = true;

            setShowShelfOnly(true);
@@ -4876,7 +4874,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        public void onConfigurationChanged(Configuration newConfig) {

            super.onConfigurationChanged(newConfig);

            mAffordanceHelper.onConfigurationChanged();

            mLastOrientation = newConfig.orientation;

        }

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -947,6 +947,15 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        verify(mKeyguardStatusBarViewController).setAlpha(statusBarAlpha);

    }



    @Test

    public void testQsToBeImmediatelyExpandedInSplitShade() {

        enableSplitShade(/* enabled= */ true);



        mNotificationPanelViewController.onTrackingStarted();



        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isTrue();

    }



    private void triggerPositionClockAndNotifications() {

        mNotificationPanelViewController.closeQs();

    }