Merge "Remove clipboard_use_description_mimetype flag" into main (83196112) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardModel.kt

+5 −14

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.text.TextUtils
		import android.util.Log
		import android.util.Size
		import android.view.textclassifier.TextLinks
		import com.android.systemui.Flags.clipboardUseDescriptionMimetype
		import com.android.systemui.res.R
		import java.io.IOException

		@@ -75,7 +74,7 @@ data class ClipboardModel(
		): ClipboardModel {
		val sensitive = clipData.description?.extras?.getBoolean(EXTRA_IS_SENSITIVE) ?: false
		val item = clipData.getItemAt(0)!!
		val type = getType(context, item, clipData.description.getMimeType(0))
		val type = getType(item, clipData.description.getMimeType(0))
		val remote = utils.isRemoteCopy(context, clipData, source)
		return ClipboardModel(
		clipData,
		@@ -89,23 +88,15 @@ data class ClipboardModel(
		)
		}

		private fun getType(context: Context, item: ClipData.Item, mimeType: String): Type {
		private fun getType(item: ClipData.Item, mimeType: String): Type {
		return if (!TextUtils.isEmpty(item.text)) {
		Type.TEXT
		} else if (item.uri != null) {
		if (clipboardUseDescriptionMimetype()) {
		if (mimeType.startsWith("image")) {
		Type.IMAGE
		} else {
		Type.URI
		}
		} else {
		if (context.contentResolver.getType(item.uri)?.startsWith("image") == true) {
		Type.IMAGE
		} else {
		Type.URI
		}
		}
		} else {
		Type.OTHER
		}

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardModelTest.kt

+0 −35

Original line number	Diff line number	Diff line
		@@ -22,11 +22,8 @@ import android.content.Context
		import android.graphics.Bitmap
		import android.net.Uri
		import android.os.PersistableBundle
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE
		import com.android.systemui.SysuiTestCase
		import java.io.IOException
		import org.junit.Assert.assertEquals
		@@ -91,23 +88,6 @@ class ClipboardModelTest : SysuiTestCase() {

		@Test
		@Throws(IOException::class)
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		fun test_imageClipData_legacy() {
		val testBitmap = Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888)
		whenever(mMockContext.contentResolver).thenReturn(mMockContentResolver)
		whenever(mMockContext.resources).thenReturn(mContext.resources)
		whenever(mMockContentResolver.loadThumbnail(any(), any(), any())).thenReturn(testBitmap)
		whenever(mMockContentResolver.getType(any())).thenReturn("image")
		val imageClipData =
		ClipData("Test", arrayOf("text/plain"), ClipData.Item(Uri.parse("test")))
		val model = ClipboardModel.fromClipData(mMockContext, mClipboardUtils, imageClipData, "")
		assertEquals(ClipboardModel.Type.IMAGE, model.type)
		assertEquals(testBitmap, model.loadThumbnail(mMockContext))
		}

		@Test
		@Throws(IOException::class)
		@EnableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		fun test_imageClipData() {
		val testBitmap = Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888)
		whenever(mMockContext.contentResolver).thenReturn(mMockContentResolver)
		@@ -119,19 +99,4 @@ class ClipboardModelTest : SysuiTestCase() {
		assertEquals(ClipboardModel.Type.IMAGE, model.type)
		assertEquals(testBitmap, model.loadThumbnail(mMockContext))
		}

		@Test
		@Throws(IOException::class)
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		fun test_imageClipData_loadFailure() {
		whenever(mMockContext.contentResolver).thenReturn(mMockContentResolver)
		whenever(mMockContext.resources).thenReturn(mContext.resources)
		whenever(mMockContentResolver.loadThumbnail(any(), any(), any())).thenThrow(IOException())
		whenever(mMockContentResolver.getType(any())).thenReturn("image")
		val imageClipData =
		ClipData("Test", arrayOf("text/plain"), ClipData.Item(Uri.parse("test")))
		val model = ClipboardModel.fromClipData(mMockContext, mClipboardUtils, imageClipData, "")
		assertEquals(ClipboardModel.Type.IMAGE, model.type)
		assertNull(model.loadThumbnail(mMockContext))
		}
		}

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

+2 −4

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

		import static com.android.systemui.Flags.FLAG_CLIPBOARD_SHARED_TRANSITIONS;
		import static com.android.systemui.Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE;
		import static com.android.systemui.Flags.FLAG_SHOW_CLIPBOARD_INDICATION;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED;
		@@ -215,11 +214,10 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		}

		@Test
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		public void test_setClipData_invalidImageData_legacy() {
		public void test_setClipData_nonImageUri_legacy() {
		initController();

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

		mOverlayController.setClipData(clipData, "");