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

Commit 8edf1e8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update FloatingRotationButton in onMeasure" into main am: 474508b7 

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



Change-Id: I674a6e2c7102f89969d188b33103f6f0550dd604
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6345adfa 474508b7

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class FloatingRotationButton implements RotationButton { 
                taskbarMarginLeft, taskbarMarginBottom, floatingRotationButtonPositionLeft);



        final int diameter = res.getDimensionPixelSize(mButtonDiameterResource);

        mKeyButtonView.setDiameter(diameter);

        mContainerSize = diameter + Math.max(defaultMargin, Math.max(taskbarMarginLeft,

                taskbarMarginBottom));

    }
@@ -195,6 +196,7 @@ public class FloatingRotationButton implements RotationButton { 
    public void updateIcon(int lightIconColor, int darkIconColor) {

        mAnimatedDrawable = (AnimatedVectorDrawable) mKeyButtonView.getContext()

                .getDrawable(mRotationButtonController.getIconResId());

        mAnimatedDrawable.setBounds(0, 0, mKeyButtonView.getWidth(), mKeyButtonView.getHeight());

        mKeyButtonView.setImageDrawable(mAnimatedDrawable);

        mKeyButtonView.setColors(lightIconColor, darkIconColor);

    }
@@ -248,8 +250,14 @@ public class FloatingRotationButton implements RotationButton { 
            updateDimensionResources();



            if (mIsShowing) {

                updateIcon(mRotationButtonController.getLightIconColor(),

                        mRotationButtonController.getDarkIconColor());

                final LayoutParams layoutParams = adjustViewPositionAndCreateLayoutParams();

                mWindowManager.updateViewLayout(mKeyButtonContainer, layoutParams);

                if (mAnimatedDrawable != null) {

                    mAnimatedDrawable.reset();

                    mAnimatedDrawable.start();

                }

            }

        }

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonView.java

+16 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class FloatingRotationButtonView extends ImageView { 
    private static final float BACKGROUND_ALPHA = 0.92f;



    private KeyButtonRipple mRipple;

    private int mDiameter;

    private final Paint mOvalBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);



    private final Configuration mLastConfiguration;
@@ -93,10 +94,25 @@ public class FloatingRotationButtonView extends ImageView { 
        mRipple.setDarkIntensity(darkIntensity);

    }



    /**

     * Sets the view's diameter.

     *

     * @param diameter the diameter value for the view

     */

    void setDiameter(int diameter) {

        mDiameter = diameter;

    }



    @Override

    public void draw(Canvas canvas) {

        int d = Math.min(getWidth(), getHeight());

        canvas.drawOval(0, 0, d, d, mOvalBgPaint);

        super.draw(canvas);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        setMeasuredDimension(mDiameter, mDiameter);

    }

}