Merge "Remove CLIPBOARD_REMOTE_BEHAVIOR flag" into udc-dev (6efcfc17) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBO
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TAP_OUTSIDE;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TIMED_OUT;
		import static com.android.systemui.flags.Flags.CLIPBOARD_REMOTE_BEHAVIOR;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		@@ -277,7 +276,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		} else if (!mIsMinimized) {
		setExpandedView();
		}
		if (mFeatureFlags.isEnabled(CLIPBOARD_REMOTE_BEHAVIOR) && mClipboardModel.isRemote()) {
		if (mClipboardModel.isRemote()) {
		mTimeoutHandler.cancelTimeout();
		mOnUiUpdate = null;
		} else {
		@@ -291,8 +290,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mView.setMinimized(false);
		switch (model.getType()) {
		case TEXT:
		if ((mFeatureFlags.isEnabled(CLIPBOARD_REMOTE_BEHAVIOR) && model.isRemote())
		\|\| DeviceConfig.getBoolean(
		if (model.isRemote() \|\| DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_SHOW_ACTIONS, false)) {
		if (model.getTextLinks() != null) {
		classifyText(model);
		@@ -326,13 +324,9 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mView.showDefaultTextPreview();
		break;
		}
		if (mFeatureFlags.isEnabled(CLIPBOARD_REMOTE_BEHAVIOR)) {
		if (!model.isRemote()) {
		maybeShowRemoteCopy(model.getClipData());
		}
		} else {
		maybeShowRemoteCopy(model.getClipData());
		}
		if (model.getType() != ClipboardModel.Type.OTHER) {
		mOnShareTapped = () -> shareContent(model.getClipData());
		mView.showShareChip();

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBO
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_EXPANDED;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_MINIMIZED;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED;
		import static com.android.systemui.flags.Flags.CLIPBOARD_REMOTE_BEHAVIOR;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		@@ -121,7 +120,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		mSampleClipData = new ClipData("Test", new String[]{"text/plain"},
		new ClipData.Item("Test Item"));

		mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, false);

		mOverlayController = new ClipboardOverlayController(
		mContext,
		@@ -234,7 +232,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {

		@Test
		public void test_remoteCopy_withFlagOn() {
		mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true);
		when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(true);

		mOverlayController.setClipData(mSampleClipData, "");
		@@ -242,18 +239,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		verify(mTimeoutHandler, never()).resetTimeout();
		}

		@Test
		public void test_remoteCopy_withFlagOff() {
		when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(true);

		mOverlayController.setClipData(mSampleClipData, "");

		verify(mTimeoutHandler).resetTimeout();
		}

		@Test
		public void test_nonRemoteCopy() {
		mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true);
		when(mClipboardUtils.isRemoteCopy(any(), any(), any())).thenReturn(false);

		mOverlayController.setClipData(mSampleClipData, "");
		@@ -279,7 +266,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		public void test_logOnClipboardActionsShown() {
		ClipData.Item item = mSampleClipData.getItemAt(0);
		item.setTextLinks(Mockito.mock(TextLinks.class));
		mFeatureFlags.set(CLIPBOARD_REMOTE_BEHAVIOR, true);
		when(mClipboardUtils.isRemoteCopy(any(Context.class), any(ClipData.class), anyString()))
		.thenReturn(true);
		when(mClipboardUtils.getAction(any(TextLinks.class), anyString()))