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

Commit 7185aa53 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes Ib5b3b032,I81147568,If9218d23 into rvc-dev am: 381b9c17 am: 63c6bf73 

Change-Id: I3ec34393b9d8e4328b0af73c89cd1beacb339146
parents c2681179 63c6bf73

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java

+1 −7
Original line number Diff line number Diff line
@@ -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));

    }