Merge "Merge "Reset target, update pointer" into rvc-dev am: fb64e7f0ac am:... (c6582891) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -947,7 +947,6 @@ public class BubbleStackView extends FrameLayout {
		new FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
		ViewClippingUtil.setClippingDeactivated(bubble.getIconView(), true, mClippingParameters);
		animateInFlyoutForBubble(bubble);
		updatePointerPosition();
		requestUpdate();
		logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__POSTED);
		}
		@@ -1005,8 +1004,8 @@ public class BubbleStackView extends FrameLayout {
		Bubble bubble = bubbles.get(i);
		mBubbleContainer.reorderView(bubble.getIconView(), i);
		}

		updateBubbleZOrdersAndDotPosition(false /* animate */);
		updatePointerPosition();
		}

		void showOverflow() {
		@@ -1394,7 +1393,7 @@ public class BubbleStackView extends FrameLayout {
		/** Called when a drag operation on an individual bubble has started. */
		public void onBubbleDragStart(View bubble) {
		if (DEBUG_BUBBLE_STACK_VIEW) {
		Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
		Log.d(TAG, "onBubbleDragStart: bubble=" + ((BadgedImageView) bubble).getKey());
		}

		if (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView())) {
		@@ -1909,6 +1908,9 @@ public class BubbleStackView extends FrameLayout {
		return;
		}
		int index = getBubbleIndex(mExpandedBubble);
		if (index == -1) {
		return;
		}
		float bubbleLeftFromScreenLeft = mExpandedAnimationController.getBubbleLeft(index);
		float halfBubble = mBubbleSize / 2f;
		float bubbleCenter = bubbleLeftFromScreenLeft + halfBubble;

+1 −0

Original line number	Diff line number	Diff line
		@@ -364,6 +364,7 @@ public class ExpandedAnimationController
		/** Resets bubble drag out gesture flags. */
		public void onGestureFinished() {
		mBubbleDraggedOutEnough = false;
		mMagnetizedBubbleDraggingOut = null;
		updateBubblePositions();
		}