Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev (4db1adb6) · Commits · e / os / android_frameworks_base

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

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -899,7 +899,7 @@ public class BubbleStackView extends FrameLayout
	mStackAnimationController.updateResources();		mStackAnimationController.updateResources();
	mBubbleOverflow.updateResources();		mBubbleOverflow.updateResources();

	if (mRelativeStackPositionBeforeRotation != null) {		if (!isStackEduShowing() && mRelativeStackPositionBeforeRotation != null) {
	mStackAnimationController.setStackPosition(		mStackAnimationController.setStackPosition(
	mRelativeStackPositionBeforeRotation);		mRelativeStackPositionBeforeRotation);
	mRelativeStackPositionBeforeRotation = null;		mRelativeStackPositionBeforeRotation = null;
	@@ -1200,6 +1200,8 @@ public class BubbleStackView extends FrameLayout
	addView(mStackEduView);		addView(mStackEduView);
	}		}
	mBubbleContainer.bringToFront();		mBubbleContainer.bringToFront();
			// Ensure the stack is in the correct spot
			mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition());
	return mStackEduView.show(mPositioner.getDefaultStartPosition());		return mStackEduView.show(mPositioner.getDefaultStartPosition());
	}		}

	@@ -1214,6 +1216,8 @@ public class BubbleStackView extends FrameLayout
	mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController);		mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController);
	addView(mStackEduView);		addView(mStackEduView);
	mBubbleContainer.bringToFront(); // Stack appears on top of the stack education		mBubbleContainer.bringToFront(); // Stack appears on top of the stack education
			// Ensure the stack is in the correct spot
			mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition());
	mStackEduView.show(mPositioner.getDefaultStartPosition());		mStackEduView.show(mPositioner.getDefaultStartPosition());
	}		}
	if (mManageEduView != null && mManageEduView.getVisibility() == VISIBLE) {		if (mManageEduView != null && mManageEduView.getVisibility() == VISIBLE) {
	@@ -1331,10 +1335,12 @@ public class BubbleStackView extends FrameLayout
	mStackAnimationController.updateResources();		mStackAnimationController.updateResources();
	mDismissView.updateResources();		mDismissView.updateResources();
	mMagneticTarget.setMagneticFieldRadiusPx(mBubbleSize * 2);		mMagneticTarget.setMagneticFieldRadiusPx(mBubbleSize * 2);
			if (!isStackEduShowing()) {
	mStackAnimationController.setStackPosition(		mStackAnimationController.setStackPosition(
	new RelativeStackPosition(		new RelativeStackPosition(
	mPositioner.getRestingPosition(),		mPositioner.getRestingPosition(),
	mStackAnimationController.getAllowableStackPositionRegion()));		mStackAnimationController.getAllowableStackPositionRegion()));
			}
	if (mIsExpanded) {		if (mIsExpanded) {
	updateExpandedView();		updateExpandedView();
	}		}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,7 @@ class StackEducationView constructor(
	* If necessary, shows the user education view for the bubble stack. This appears the first		* If necessary, shows the user education view for the bubble stack. This appears the first
	* time a user taps on a bubble.		* time a user taps on a bubble.
	*		*
	* @return true if user education was shown, false otherwise.		* @return true if user education was shown and wasn't showing before, false otherwise.
	*/		*/
	fun show(stackPosition: PointF): Boolean {		fun show(stackPosition: PointF): Boolean {
	isHiding = false		isHiding = false