Merge "Merge "Remove code that seems unneccessary & has a leak" into rvc-dev... (11355ea3) · Commits · e / os / android_frameworks_base

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);