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

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

Merge "Fix issues with landscape transition" into rvc-dev am: f769298b 

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

Change-Id: I940d9185b90858ab601031fdc87b1590c2046d78
parents 49c45fae f769298b

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ public class BubbleExpandedView extends LinearLayout { 
                desiredHeight = Math.max(mBubble.getDesiredHeight(mContext), mMinHeight);

            }

            float height = Math.min(desiredHeight, getMaxExpandedHeight());

            height = Math.max(height, mIsOverflow? mOverflowHeight : mMinHeight);

            height = Math.max(height, mMinHeight);

            ViewGroup.LayoutParams lp = mActivityView.getLayoutParams();

            mNeedsNewHeight = lp.height != height;

            if (!mKeyboardVisible) {

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+8 −9
Original line number Diff line number Diff line
@@ -889,14 +889,7 @@ public class BubbleStackView extends FrameLayout 
                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {

                    mExpandedAnimationController.updateResources(mOrientation, mDisplaySize);

                    mStackAnimationController.updateResources(mOrientation);



                    // Reposition & adjust the height for new orientation

                    if (mIsExpanded) {

                        mExpandedViewContainer.setTranslationY(getExpandedViewY());

                        if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {

                            mExpandedBubble.getExpandedView().updateView(getLocationOnScreen());

                        }

                    }

                    mBubbleOverflow.updateDimensions();



                    // Need to update the padding around the view

                    WindowInsets insets = getRootWindowInsets();
@@ -920,9 +913,15 @@ public class BubbleStackView extends FrameLayout 


                    if (mIsExpanded) {

                        // Re-draw bubble row and pointer for new orientation.

                        mExpandedAnimationController.expandFromStack(() -> {

                        beforeExpandedViewAnimation();

                        updateOverflowVisibility();

                        updatePointerPosition();

                        mExpandedAnimationController.expandFromStack(() -> {

                            afterExpandedViewAnimation();

                        } /* after */);

                        mExpandedViewContainer.setTranslationX(0);

                        mExpandedViewContainer.setTranslationY(getExpandedViewY());

                        mExpandedViewContainer.setAlpha(1f);

                    }

                    if (mVerticalPosPercentBeforeRotation >= 0) {

                        mStackAnimationController.moveStackToSimilarPositionAfterRotation(

packages/SystemUI/src/com/android/systemui/bubbles/animation/ExpandedAnimationController.java

+16 −17
Original line number Diff line number Diff line
@@ -203,12 +203,22 @@ public class ExpandedAnimationController 
    public void updateResources(int orientation, Point displaySize) {

        mScreenOrientation = orientation;

        mDisplaySize = displaySize;

        if (mLayout != null) {

        if (mLayout == null) {

            return;

        }

        Resources res = mLayout.getContext().getResources();

        mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top);

        mStatusBarHeight = res.getDimensionPixelSize(

                com.android.internal.R.dimen.status_bar_height);

        }

        mStackOffsetPx = res.getDimensionPixelSize(R.dimen.bubble_stack_offset);

        mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top);

        mBubbleSizePx = res.getDimensionPixelSize(R.dimen.individual_bubble_size);

        mBubblesMaxRendered = res.getInteger(R.integer.bubbles_max_rendered);



        // Includes overflow button.

        float totalGapWidth = getWidthForDisplayingBubbles() - (mExpandedViewPadding * 2)

                - (mBubblesMaxRendered + 1) * mBubbleSizePx;

        mSpaceBetweenBubbles = totalGapWidth / mBubblesMaxRendered;

    }



    /**
@@ -464,18 +474,7 @@ public class ExpandedAnimationController 


    @Override

    void onActiveControllerForLayout(PhysicsAnimationLayout layout) {

        final Resources res = layout.getResources();

        mStackOffsetPx = res.getDimensionPixelSize(R.dimen.bubble_stack_offset);

        mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top);

        mBubbleSizePx = res.getDimensionPixelSize(R.dimen.individual_bubble_size);

        mStatusBarHeight =

                res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);

        mBubblesMaxRendered = res.getInteger(R.integer.bubbles_max_rendered);



        // Includes overflow button.

        float totalGapWidth = getWidthForDisplayingBubbles() - (mExpandedViewPadding * 2)

                - (mBubblesMaxRendered + 1) * mBubbleSizePx;

        mSpaceBetweenBubbles = totalGapWidth / mBubblesMaxRendered;

        updateResources(mScreenOrientation, mDisplaySize);



        // Ensure that all child views are at 1x scale, and visible, in case they were animating

        // in.