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

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

Merge "Removing translation of shade dependent on finger position" into... 

Merge "Removing translation of shade dependent on finger position" into sc-v2-dev am: 5b73d129 am: e4931e88

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

Change-Id: I8359e96dcfa22f910e269a0a6c4034413cc4d9d8
parents af6fd45f e4931e88

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

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mHeadsUpStatusBarView.setOnDrawingRectChangedListener(null);

        mWakeUpCoordinator.removeListener(this);

        mNotificationPanelViewController.removeTrackingHeadsUpListener(mSetTrackingHeadsUp);

        mNotificationPanelViewController.setVerticalTranslationListener(null);

        mNotificationPanelViewController.setHeadsUpAppearanceController(null);

        mStackScrollerController.removeOnExpandedHeightChangedListener(mSetExpandedHeight);

        mDarkIconDispatcher.removeDarkReceiver(this);

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

+0 −52
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private ArrayList<Consumer<ExpandableNotificationRow>>

            mTrackingHeadsUpListeners =

            new ArrayList<>();

    private Runnable mVerticalTranslationListener;

    private HeadsUpAppearanceController mHeadsUpAppearanceController;



    private int mPanelAlpha;
@@ -3392,7 +3391,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    @Override

    protected void onClosingFinished() {

        super.onClosingFinished();

        resetHorizontalPanelPosition();

        setClosingWithAlphaFadeout(false);

        mMediaHierarchyManager.closeGuts();

    }
@@ -3402,47 +3400,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mNotificationStackScrollLayoutController.forceNoOverlappingRendering(closing);

    }



    /**

     * Updates the horizontal position of the panel so it is positioned closer to the touch

     * responsible for opening the panel.

     *

     * @param x the x-coordinate the touch event

     */

    protected void updateHorizontalPanelPosition(float x) {

        if (mNotificationStackScrollLayoutController.getWidth() * 1.75f > mView.getWidth()

                || mShouldUseSplitNotificationShade) {

            resetHorizontalPanelPosition();

            return;

        }

        float leftMost = mPositionMinSideMargin

                + mNotificationStackScrollLayoutController.getWidth() / 2;

        float

                rightMost =

                mView.getWidth() - mPositionMinSideMargin

                        - mNotificationStackScrollLayoutController.getWidth() / 2;

        if (Math.abs(x - mView.getWidth() / 2)

                < mNotificationStackScrollLayoutController.getWidth() / 4) {

            x = mView.getWidth() / 2;

        }

        x = Math.min(rightMost, Math.max(leftMost, x));

        float

                center = mNotificationStackScrollLayoutController.getLeft()

                + mNotificationStackScrollLayoutController.getWidth() / 2;

        setHorizontalPanelTranslation(x - center);

    }



    private void resetHorizontalPanelPosition() {

        setHorizontalPanelTranslation(0f);

    }



    protected void setHorizontalPanelTranslation(float translation) {

        mNotificationStackScrollLayoutController.setTranslationX(translation);

        mQsFrame.setTranslationX(translation);

        if (mVerticalTranslationListener != null) {

            mVerticalTranslationListener.run();

        }

    }



    protected void updateExpandedHeight(float expandedHeight) {

        if (mTracking) {

            mNotificationStackScrollLayoutController
@@ -3755,10 +3712,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mTrackingHeadsUpListeners.remove(listener);

    }



    public void setVerticalTranslationListener(Runnable verticalTranslationListener) {

        mVerticalTranslationListener = verticalTranslationListener;

    }



    public void setHeadsUpAppearanceController(

            HeadsUpAppearanceController headsUpAppearanceController) {

        mHeadsUpAppearanceController = headsUpAppearanceController;
@@ -4027,7 +3980,6 @@ public class NotificationPanelViewController extends PanelViewController { 
                }

                if (event.getActionMasked() == MotionEvent.ACTION_DOWN && isFullyCollapsed()) {

                    mMetricsLogger.count(COUNTER_PANEL_OPEN, 1);

                    updateHorizontalPanelPosition(event.getX());

                    handled = true;

                }
@@ -4532,7 +4484,6 @@ public class NotificationPanelViewController extends PanelViewController { 
            // The update needs to happen after the headerSlide in above, otherwise the translation

            // would reset

            maybeAnimateBottomAreaAlpha();

            resetHorizontalPanelPosition();

            updateQsState();

            mSplitShadeHeaderController.setShadeExpanded(

                    mBarState == SHADE || mBarState == SHADE_LOCKED);
@@ -4783,9 +4734,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        public void onConfigurationChanged(Configuration newConfig) {

            super.onConfigurationChanged(newConfig);

            mAffordanceHelper.onConfigurationChanged();

            if (newConfig.orientation != mLastOrientation) {

                resetHorizontalPanelPosition();

            }

            mLastOrientation = newConfig.orientation;

        }

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
        mHeadsUpAppearanceController.destroy();

        verify(mHeadsUpManager).removeListener(any());

        verify(mDarkIconDispatcher).removeDarkReceiver((DarkIconDispatcher.DarkReceiver) any());

        verify(mPanelView).setVerticalTranslationListener(isNull());

        verify(mPanelView).removeTrackingHeadsUpListener(any());

        verify(mPanelView).setHeadsUpAppearanceController(isNull());

        verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any());

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

+0 −12
Original line number Diff line number Diff line
@@ -724,18 +724,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        assertThat(getConstraintSetLayout(R.id.notification_stack_scroller).mWidth).isEqualTo(0);

    }



    @Test

    public void testOnDragDownEvent_horizontalTranslationIsZeroForSplitShade() {

        when(mNotificationStackScrollLayoutController.getWidth()).thenReturn(350f);

        when(mView.getWidth()).thenReturn(800);

        enableSplitShade(/* enabled= */ true);



        onTouchEvent(MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN,

                200f /* x position */, 0f, 0));



        verify(mQsFrame).setTranslationX(0);

    }



    @Test

    public void testCanCollapsePanelOnTouch_trueForKeyGuard() {

        mStatusBarStateController.setState(KEYGUARD);