Merge "Fix bubble reordering issue" into main (80e74ab7) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -717,11 +717,6 @@ public class BubbleStackView extends FrameLayout

	// Hide the stack after a delay, if needed.		// Hide the stack after a delay, if needed.
	updateTemporarilyInvisibleAnimation(false /* hideImmediately */);		updateTemporarilyInvisibleAnimation(false /* hideImmediately */);

	if (mShouldReorderBubblesAfterGestureCompletes) {
	mShouldReorderBubblesAfterGestureCompletes = false;
	updateBubbleOrderInternal(mBubbleData.getBubbles(), true);
	}
	}		}
	};		};

	@@ -2732,6 +2727,12 @@ public class BubbleStackView extends FrameLayout
	ev.getAction() != MotionEvent.ACTION_UP		ev.getAction() != MotionEvent.ACTION_UP
	&& ev.getAction() != MotionEvent.ACTION_CANCEL;		&& ev.getAction() != MotionEvent.ACTION_CANCEL;

			// If there is a deferred reorder action, and the gesture is over, run it now.
			if (mShouldReorderBubblesAfterGestureCompletes && !mIsGestureInProgress) {
			mShouldReorderBubblesAfterGestureCompletes = false;
			updateBubbleOrderInternal(mBubbleData.getBubbles(), false);
			}

	return dispatched;		return dispatched;
	}		}