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

Commit 11810a63 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Remove code that seems unneccessary & has a leak" into rvc-dev... 

Merge "Merge "Remove code that seems unneccessary & has a leak" into rvc-dev am: b74c1ad2 am: 2260ab02 am: 80b28028" into rvc-qpr-dev-plus-aosp am: 11355ea3

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

Change-Id: I550950b1485f27c3d6509a5c561334e2c86e8c69
parents 9b4df164 11355ea3

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

+0 −16
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import androidx.dynamicanimation.animation.SpringForce; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ContrastColorUtil;

import com.android.internal.widget.ViewClippingUtil;

import com.android.systemui.Interpolators;

import com.android.systemui.Prefs;

import com.android.systemui.R;
@@ -292,20 +291,6 @@ public class BubbleStackView extends FrameLayout 
    private ViewTreeObserver.OnDrawListener mSystemGestureExcludeUpdater =

            this::updateSystemGestureExcludeRects;



    private ViewClippingUtil.ClippingParameters mClippingParameters =

            new ViewClippingUtil.ClippingParameters() {



                @Override

                public boolean shouldFinish(View view) {

                    return false;

                }



                @Override

                public boolean isClippingEnablingAllowed(View view) {

                    return !mIsExpanded;

                }

            };



    /** Float property that 'drags' the flyout. */

    private final FloatPropertyCompat mFlyoutCollapseProperty =

            new FloatPropertyCompat("FlyoutCollapseSpring") {
@@ -1399,7 +1384,6 @@ public class BubbleStackView extends FrameLayout 


        mBubbleContainer.addView(bubble.getIconView(), 0,

                new FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));

        ViewClippingUtil.setClippingDeactivated(bubble.getIconView(), true, mClippingParameters);

        animateInFlyoutForBubble(bubble);

        requestUpdate();

        logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__POSTED);