Merge "[Flag cleanup] com.android.systemui.floating_menu_animated_tuck" into main (6d5421b1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationController.java

+18 −27

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import androidx.dynamicanimation.animation.SpringForce;
		import androidx.recyclerview.widget.RecyclerView;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Flags;

		import java.util.HashMap;

		@@ -339,15 +338,11 @@ class MenuAnimationController {
		mMenuView.updateMenuMoveToTucked(/* isMoveToTucked= */ true);
		final PointF position = mMenuView.getMenuPosition();
		final PointF tuckedPosition = getTuckedMenuPosition();
		if (Flags.floatingMenuAnimatedTuck()) {
		flingThenSpringMenuWith(DynamicAnimation.TRANSLATION_X,
		Math.signum(tuckedPosition.x - position.x) * ESCAPE_VELOCITY,
		FLING_FRICTION_SCALAR,
		createDefaultSpringForce(),
		tuckedPosition.x);
		} else {
		moveToPosition(tuckedPosition);
		}

		// Keep the touch region let users could click extra space to pop up the menu view
		// from the screen edge
		@@ -359,7 +354,6 @@ class MenuAnimationController {
		void moveOutEdgeAndShow() {
		mMenuView.updateMenuMoveToTucked(/* isMoveToTucked= */ false);

		if (Flags.floatingMenuAnimatedTuck()) {
		PointF position = mMenuView.getMenuPosition();
		springMenuWith(DynamicAnimation.TRANSLATION_X,
		createDefaultSpringForce(),
		@@ -373,9 +367,6 @@ class MenuAnimationController {
		position.y,
		true
		);
		} else {
		mMenuView.onPositionChanged();
		}

		mMenuView.onEdgeChangedIfNeeded();
		}

+0 −16

Original line number	Diff line number	Diff line
		@@ -321,22 +321,6 @@ class MenuView extends FrameLayout implements
		if (mMoveToTuckedListener != null) {
		mMoveToTuckedListener.onMoveToTuckedChanged(isMoveToTucked);
		}

		if (!Flags.floatingMenuAnimatedTuck()) {
		if (isMoveToTucked) {
		final float halfWidth = getMenuWidth() / 2.0f;
		final boolean isOnLeftSide = mMenuAnimationController.isOnLeftSide();
		final Rect clipBounds = new Rect(
		(int) (!isOnLeftSide ? 0 : halfWidth),
		0,
		(int) (!isOnLeftSide ? halfWidth : getMenuWidth()),
		getMenuHeight()
		);
		setClipBounds(clipBounds);
		} else {
		setClipBounds(null);
		}
		}
		}

+4 −7

Original line number	Diff line number	Diff line
		@@ -322,9 +322,8 @@ class MenuViewLayer extends FrameLayout implements
		}
		addView(mMessageView, LayerIndex.MESSAGE_VIEW);

		if (Flags.floatingMenuAnimatedTuck()) {
		setClipChildren(true);
		}

		setClickable(false);
		setFocusable(false);
		setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
		@@ -476,11 +475,9 @@ class MenuViewLayer extends FrameLayout implements
		mMenuAnimationController.startTuckedAnimationPreview();
		}

		if (Flags.floatingMenuAnimatedTuck()) {
		if (!mMenuView.isMoveToTucked()) {
		setClipBounds(null);
		}
		}
		mMenuView.onArrivalAtPosition(false);
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.verifyZeroInteractions;

		import android.graphics.PointF;
		import android.platform.test.annotations.EnableFlags;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.view.View;
		@@ -40,7 +39,6 @@ import androidx.dynamicanimation.animation.SpringAnimation;
		import androidx.dynamicanimation.animation.SpringForce;
		import androidx.test.filters.SmallTest;

		import com.android.systemui.Flags;
		import com.android.systemui.Prefs;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.accessibility.utils.TestUtils;
		@@ -230,7 +228,6 @@ public class MenuAnimationControllerTest extends SysuiTestCase {
		}

		@Test
		@EnableFlags(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)
		public void tuck_animates() {
		mMenuAnimationController.cancelAnimations();
		mMenuAnimationController.moveToEdgeAndHide();
		@@ -239,7 +236,6 @@ public class MenuAnimationControllerTest extends SysuiTestCase {
		}

		@Test
		@EnableFlags(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)
		public void untuck_animates() {
		mMenuAnimationController.cancelAnimations();
		mMenuAnimationController.moveOutEdgeAndShow();