Remove rolled-out clipboard_image_timeout flag (2c813015) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -737,16 +737,6 @@ flag {
		}
		}

		flag {
		name: "clipboard_image_timeout"
		namespace: "systemui"
		description: "Wait for clipboard image to load before showing UI"
		bug: "359864629"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "clipboard_use_description_mimetype"
		namespace: "systemui"

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

+17 −92

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.clipboardoverlay;
		import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;

		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS;
		import static com.android.systemui.Flags.clipboardImageTimeout;
		import static com.android.systemui.Flags.clipboardSharedTransitions;
		import static com.android.systemui.Flags.showClipboardIndication;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;
		@@ -301,7 +300,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		if (showClipboardIndication()) {
		mClipboardIndicationProvider.getIndicationText(mIndicationCallback);
		}
		if (clipboardImageTimeout()) {
		if (shouldAnimate) {
		reset();
		mClipboardLogger.setClipSource(mClipboardModel.getSource());
		@@ -320,25 +318,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		setExpandedView(() -> {
		});
		}
		} else {
		if (shouldAnimate) {
		reset();
		mClipboardLogger.setClipSource(mClipboardModel.getSource());
		if (shouldShowMinimized(mWindow.getWindowInsets())) {
		mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED);
		mIsMinimized = true;
		mView.setMinimized(true);
		} else {
		mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED);
		setExpandedView();
		}
		animateIn();
		mWindow.withWindowAttached(() -> mView.announceForAccessibility(
		getAccessibilityAnnouncement(mClipboardModel.getType())));
		} else if (!mIsMinimized) {
		setExpandedView();
		}
		}
		if (mClipboardModel.isRemote()) {
		mTimeoutHandler.cancelTimeout();
		mOnUiUpdate = null;
		@@ -400,54 +379,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		}
		}

		private void setExpandedView() {
		final ClipboardModel model = mClipboardModel;
		mView.setMinimized(false);
		switch (model.getType()) {
		case TEXT:
		if (model.isRemote() \|\| DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_SHOW_ACTIONS, false)) {
		if (model.getTextLinks() != null) {
		classifyText(model);
		}
		}
		if (model.isSensitive()) {
		mView.showTextPreview(mContext.getString(R.string.clipboard_asterisks), true);
		} else {
		mView.showTextPreview(model.getText().toString(), false);
		}
		mView.setEditAccessibilityAction(true);
		mOnPreviewTapped = this::editText;
		break;
		case IMAGE:
		mBgExecutor.execute(() -> {
		if (model.isSensitive() \|\| model.loadThumbnail(mContext) != null) {
		mView.post(() -> {
		mView.showImagePreview(
		model.isSensitive() ? null : model.loadThumbnail(mContext));
		mView.setEditAccessibilityAction(true);
		});
		mOnPreviewTapped = () -> editImage(model.getUri());
		} else {
		// image loading failed
		mView.post(mView::showDefaultTextPreview);
		}
		});
		break;
		case URI:
		case OTHER:
		mView.showDefaultTextPreview();
		break;
		}
		if (!model.isRemote()) {
		maybeShowRemoteCopy(model.getClipData());
		}
		if (model.getType() != ClipboardModel.Type.OTHER) {
		mOnShareTapped = () -> shareContent(model.getClipData());
		mView.showShareChip();
		}
		}

		private boolean shouldShowMinimized(WindowInsets insets) {
		return insets.getInsets(WindowInsets.Type.ime()).bottom > 0;
		}
		@@ -465,12 +396,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED);
		mIsMinimized = false;
		}
		if (clipboardImageTimeout()) {
		setExpandedView(() -> animateIn());
		} else {
		setExpandedView();
		animateIn();
		}
		}
		});
		mEnterAnimator.start();
		@@ -536,8 +462,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mInputMonitor.getInputChannel(), Looper.getMainLooper()) {
		@Override
		public void onInputEvent(InputEvent event) {
		if ((!clipboardImageTimeout() \|\| mShowingUi)
		&& event instanceof MotionEvent) {
		if (mShowingUi && event instanceof MotionEvent) {
		MotionEvent motionEvent = (MotionEvent) event;
		if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
		if (!mView.isInTouchRegion(

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -234,9 +234,6 @@ object Flags {

		// 1700 - clipboard
		@JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag("clipboard_remote_behavior")
		// TODO(b/278714186) Tracking Bug
		@JvmField
		val CLIPBOARD_IMAGE_TIMEOUT = unreleasedFlag("clipboard_image_timeout", teamfood = true)

		// 1900
		@JvmField val NOTE_TASKS = releasedFlag("keycode_flag")

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

+0 −68

Original line number	Diff line number	Diff line
		@@ -223,74 +223,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		public void test_setClipData_nonImageUri_legacy() {
		initController();

		ClipData clipData = new ClipData("", new String[]{"resource/png"},
		new ClipData.Item(Uri.parse("")));

		mOverlayController.setClipData(clipData, "");

		verify(mClipboardOverlayView, times(1)).showDefaultTextPreview();
		verify(mClipboardOverlayView, times(1)).showShareChip();
		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		public void test_setClipData_textData_legacy() {
		initController();

		mOverlayController.setClipData(mSampleClipData, "abc");

		verify(mClipboardOverlayView, times(1)).showTextPreview("Test Item", false);
		verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "abc");
		verify(mClipboardOverlayView, times(1)).showShareChip();
		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		public void test_setClipData_sensitiveTextData_legacy() {
		initController();

		ClipDescription description = mSampleClipData.getDescription();
		PersistableBundle b = new PersistableBundle();
		b.putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true);
		description.setExtras(b);
		ClipData data = new ClipData(description, mSampleClipData.getItemAt(0));
		mOverlayController.setClipData(data, "");

		verify(mClipboardOverlayView, times(1)).showTextPreview("••••••", true);
		verify(mClipboardOverlayView, times(1)).showShareChip();
		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		public void test_setClipData_repeatedCalls_legacy() {
		when(mAnimator.isRunning()).thenReturn(true);
		initController();

		mOverlayController.setClipData(mSampleClipData, "");
		mOverlayController.setClipData(mSampleClipData, "");

		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		public void test_setClipData_invalidImageData() {
		initController();

		ClipData clipData = new ClipData("", new String[]{"image/png"},
		new ClipData.Item(Uri.parse("")));

		mOverlayController.setClipData(clipData, "");

		verify(mClipboardOverlayView, times(1)).showDefaultTextPreview();
		verify(mClipboardOverlayView, times(1)).showShareChip();
		verify(mClipboardOverlayView, times(1)).getEnterAnimation();
		}

		@Test
		public void test_setClipData_nonImageUri() {
		initController();