From e48c41187c6763895dd6851b0579513d759c1ab3 Mon Sep 17 00:00:00 2001 From: Joshua Tsuji Date: Wed, 26 Feb 2020 14:36:25 -0500 Subject: [PATCH] Fix LayoutParams issue with DismissCircleView. Test: atest SystemUITests Bug: 150795338 Change-Id: Ib5b3b0325d9b460eb8c90a7aef27acb83cf4ae3f --- .../src/com/android/systemui/bubbles/BubbleStackView.java | 3 ++- .../src/com/android/systemui/util/DismissCircleView.java | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index a902462cee4de..91c87806b1db0 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -492,9 +492,10 @@ public class BubbleStackView extends FrameLayout { .setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY)); mFlyoutTransitionSpring.addEndListener(mAfterFlyoutTransitionSpring); + final int targetSize = res.getDimensionPixelSize(R.dimen.dismiss_circle_size); final View targetView = new DismissCircleView(context); final FrameLayout.LayoutParams newParams = - new FrameLayout.LayoutParams(targetView.getLayoutParams()); + new FrameLayout.LayoutParams(targetSize, targetSize); newParams.gravity = Gravity.CENTER; targetView.setLayoutParams(newParams); mDismissTargetAnimator = PhysicsAnimator.getInstance(targetView); diff --git a/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java b/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java index e3668dae94176..6c3538cb6142b 100644 --- a/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java +++ b/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.view.Gravity; -import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; @@ -56,12 +55,7 @@ public class DismissCircleView extends FrameLayout { /** Retrieves the current dimensions for the icon and circle and applies them. */ private void setViewSizes() { final Resources res = getResources(); - - int iconSize = res.getDimensionPixelSize(R.dimen.dismiss_target_x_size); - int targetSize = res.getDimensionPixelSize(R.dimen.dismiss_circle_size); - - setLayoutParams(new ViewGroup.LayoutParams(targetSize, targetSize)); - + final int iconSize = res.getDimensionPixelSize(R.dimen.dismiss_target_x_size); mIconView.setLayoutParams( new FrameLayout.LayoutParams(iconSize, iconSize, Gravity.CENTER)); }