Merge "Cleanup of floatingMenuRadiiAnimation" into main (9616f567) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java

+3 −12

Original line number	Diff line number	Diff line
		@@ -185,11 +185,7 @@ class MenuView extends FrameLayout implements
		final GradientDrawable gradientDrawable = getContainerViewGradient();
		gradientDrawable.setStroke(mMenuViewAppearance.getMenuStrokeWidth(),
		mMenuViewAppearance.getMenuStrokeColor());
		if (Flags.floatingMenuRadiiAnimation()) {
		mMenuAnimationController.startRadiiAnimation(mMenuViewAppearance.getMenuRadii());
		} else {
		gradientDrawable.setCornerRadii(mMenuViewAppearance.getMenuRadii());
		}
		}

		void setRadii(float[] radii) {
		@@ -402,13 +398,8 @@ class MenuView extends FrameLayout implements
		getContainerViewInsetLayer().setLayerInset(INDEX_MENU_ITEM, insets[0], insets[1], insets[2],
		insets[3]);

		if (Flags.floatingMenuRadiiAnimation()) {
		mMenuAnimationController.startRadiiAnimation(
		mMenuViewAppearance.getMenuMovingStateRadii());
		} else {
		final GradientDrawable gradientDrawable = getContainerViewGradient();
		gradientDrawable.setCornerRadii(mMenuViewAppearance.getMenuMovingStateRadii());
		}
		}

		void onBoundsInParentChanged(int newLeft, int newTop) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ class RadiiAnimator {
		@Override
		public void onAnimationRepeat(@NonNull Animator animation) {}
		});
		mAnimationDriver.setInterpolator(new android.view.animation.BounceInterpolator());
		mAnimationDriver.setInterpolator(new android.view.animation.DecelerateInterpolator());
		}

		void startAnimation(float[] endValues) {