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

Commit 0e203be0 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Fix QS and QS Footer sometimes having low alpha after expansion" into... 

Merge "Fix QS and QS Footer sometimes having low alpha after expansion" into tm-qpr-dev am: 23cb555f

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



Change-Id: If76dc35c27b6cb0647f4f0c146ca3e6b5195eb97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e622a83 23cb555f

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -636,7 +636,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
                && mLastKeyguardAndExpanded == onKeyguardAndExpanded

                && mLastViewHeight == currentHeight

                && mLastHeaderTranslation == headerTranslation

                && mSquishinessFraction == squishinessFraction) {

                && mSquishinessFraction == squishinessFraction

                && mLastPanelFraction == panelExpansionFraction) {

            return;

        }

        mLastHeaderTranslation = headerTranslation;

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

+2 −2
Original line number Diff line number Diff line
@@ -3706,10 +3706,10 @@ public final class NotificationPanelViewController implements Dumpable { 
                    mHeightAnimator.end();

                }

            }

            mQsController.setShadeExpandedHeight(mExpandedHeight);

            mExpansionDragDownAmountPx = h;

            mExpandedFraction = Math.min(1f,

                    maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);

            mQsController.setShadeExpansion(mExpandedHeight, mExpandedFraction);

            mExpansionDragDownAmountPx = h;

            mAmbientState.setExpansionFraction(mExpandedFraction);

            onHeightUpdated(mExpandedHeight);

            updatePanelExpansionAndVisibility();

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

+3 −8
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ public class QuickSettingsController { 
        mFeatureFlags = featureFlags;

        mInteractionJankMonitor = interactionJankMonitor;



        mShadeExpansionStateManager.addExpansionListener(this::onPanelExpansionChanged);

        mLockscreenShadeTransitionController.addCallback(new LockscreenShadeTransitionCallback());

    }
@@ -845,8 +844,9 @@ public class QuickSettingsController { 
        mCollapsedOnDown = collapsedOnDown;

    }



    void setShadeExpandedHeight(float shadeExpandedHeight) {

        mShadeExpandedHeight = shadeExpandedHeight;

    void setShadeExpansion(float expandedHeight, float expandedFraction) {

        mShadeExpandedHeight = expandedHeight;

        mShadeExpandedFraction = expandedFraction;

    }



    @VisibleForTesting
@@ -1698,11 +1698,6 @@ public class QuickSettingsController { 
        return false;

    }



    @VisibleForTesting

    void onPanelExpansionChanged(ShadeExpansionChangeEvent event) {

        mShadeExpandedFraction = event.getFraction();

    }



    /**

     * Animate QS closing by flinging it.

     * If QS is expanded, it will collapse into QQS and stop.

packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerTest.java

+7 −14
Original line number Diff line number Diff line
@@ -275,9 +275,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 


    @Test

    public void testPanelStaysOpenWhenClosingQs() {

        mShadeExpansionStateManager.onPanelExpansionChanged(/* fraction= */ 1,

                /* expanded= */ true, /* tracking= */ false, /* dragDownPxAmount= */ 0);

        mQsController.setShadeExpandedHeight(1);

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);



        float shadeExpandedHeight = mQsController.getShadeExpandedHeight();

        mQsController.animateCloseQs(false);
@@ -289,7 +287,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 
    public void interceptTouchEvent_withinQs_shadeExpanded_startsQsTracking() {

        mQsController.setQs(mQs);



        mQsController.setShadeExpandedHeight(1f);

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);

        mQsController.onIntercept(

                createMotionEvent(0, 0, ACTION_DOWN));

        mQsController.onIntercept(
@@ -303,7 +301,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 
        enableSplitShade(true);

        mQsController.setQs(mQs);



        mQsController.setShadeExpandedHeight(1f);

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);

        mQsController.onIntercept(

                createMotionEvent(0, 0, ACTION_DOWN));

        mQsController.onIntercept(
@@ -342,13 +340,8 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 
    public void handleTouch_downActionInQsArea() {

        mQsController.setQs(mQs);

        mQsController.setBarState(SHADE);

        mQsController.onPanelExpansionChanged(

                new ShadeExpansionChangeEvent(

                        0.5f,

                        true,

                        true,

                        0

                ));

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 0.5f);



        MotionEvent event =

                createMotionEvent(QS_FRAME_WIDTH / 2, QS_FRAME_BOTTOM / 2, ACTION_DOWN);

        mQsController.handleTouch(event, false, false);
@@ -385,7 +378,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 
    @Test

    public void handleTouch_isConflictingExpansionGestureSet() {

        assertThat(mQsController.isConflictingExpansionGesture()).isFalse();

        mShadeExpansionStateManager.onPanelExpansionChanged(1f, true, false, 0f);

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);

        mQsController.handleTouch(MotionEvent.obtain(0L /* downTime */,

                0L /* eventTime */, ACTION_DOWN, 0f /* x */, 0f /* y */,

                0 /* metaState */), false, false);
@@ -394,7 +387,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase { 


    @Test

    public void handleTouch_isConflictingExpansionGestureSet_cancel() {

        mShadeExpansionStateManager.onPanelExpansionChanged(1f, true, false, 0f);

        mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);

        mQsController.handleTouch(createMotionEvent(0, 0, ACTION_DOWN), false, false);

        assertThat(mQsController.isConflictingExpansionGesture()).isTrue();

        mQsController.handleTouch(createMotionEvent(0, 0, ACTION_UP), true, true);