Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ib5b3b032,I81147568,If9218d23 into rvc-dev am: 381b9c1781

Browse Source 
Change-Id: I81812edcdca202e73896e4f0d01f872c32b4a1bb
This commit is contained in:
Automerger Merge Worker
2020-03-07 19:38:48 +00:00
parent 8074bd3b29 381b9c1781
commit 63c6bf7312
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -492,9 +492,10 @@ public class BubbleStackView extends FrameLayout {
.setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY)); .setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY));
mFlyoutTransitionSpring.addEndListener(mAfterFlyoutTransitionSpring); mFlyoutTransitionSpring.addEndListener(mAfterFlyoutTransitionSpring);
final int targetSize = res.getDimensionPixelSize(R.dimen.dismiss_circle_size);
final View targetView = new DismissCircleView(context); final View targetView = new DismissCircleView(context);
final FrameLayout.LayoutParams newParams = final FrameLayout.LayoutParams newParams =
new FrameLayout.LayoutParams(targetView.getLayoutParams()); new FrameLayout.LayoutParams(targetSize, targetSize);
newParams.gravity = Gravity.CENTER; newParams.gravity = Gravity.CENTER;
targetView.setLayoutParams(newParams); targetView.setLayoutParams(newParams);
mDismissTargetAnimator = PhysicsAnimator.getInstance(targetView); mDismissTargetAnimator = PhysicsAnimator.getInstance(targetView);

8
packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.view.Gravity; import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; 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. */ /** Retrieves the current dimensions for the icon and circle and applies them. */
private void setViewSizes() { private void setViewSizes() {
final Resources res = getResources(); final Resources res = getResources();
final int iconSize = res.getDimensionPixelSize(R.dimen.dismiss_target_x_size);
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));
mIconView.setLayoutParams( mIconView.setLayoutParams(
new FrameLayout.LayoutParams(iconSize, iconSize, Gravity.CENTER)); new FrameLayout.LayoutParams(iconSize, iconSize, Gravity.CENTER));
} }