From c86df12077c3948cf857d3e2087ca93bf2d256af Mon Sep 17 00:00:00 2001 From: 1 Date: Thu, 1 Jun 2023 14:11:59 +0000 Subject: Hide text toggle check We may use it in the future, but hiding it for UDC based upon product/UX feedback. Bug: 283245199 Bug: 285309527 Test: atest IntentResolverUnitTests Change-Id: Ife0911200191adc05ddeb0f5c62b7f3ca58fa961 --- .../contentpreview/FilesPlusTextContentPreviewUi.java | 6 +++++- .../com/android/intentresolver/UnbundledChooserActivityTest.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java index e4677d90..35990990 100644 --- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java @@ -62,6 +62,8 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi { private Uri mFirstFilePreviewUri; private boolean mAllImages; private boolean mAllVideos; + // TODO(b/285309527): make this a flag + private static final boolean SHOW_TOGGLE_CHECKMARK = false; FilesPlusTextContentPreviewUi( Lifecycle lifecycle, @@ -201,7 +203,9 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi { shareTextAction.accept(!isChecked); updateHeadline(contentPreview); }); - includeText.setVisibility(View.VISIBLE); + if (SHOW_TOGGLE_CHECKMARK) { + includeText.setVisibility(View.VISIBLE); + } } private String getNoTextString(Resources resources) { diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 99564ae3..3ddd4394 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -694,6 +694,7 @@ public class UnbundledChooserActivityTest { } @Test + @Ignore("b/285309527") public void testFilePlusTextSharing_ExcludeText() { Uri uri = createTestContentProviderUri(null, "image/png"); Intent sendIntent = createSendImageIntent(uri); @@ -735,6 +736,7 @@ public class UnbundledChooserActivityTest { } @Test + @Ignore("b/285309527") public void testFilePlusTextSharing_RemoveAndAddBackText() { Uri uri = createTestContentProviderUri("application/pdf", "image/png"); Intent sendIntent = createSendImageIntent(uri); @@ -782,6 +784,7 @@ public class UnbundledChooserActivityTest { } @Test + @Ignore("b/285309527") public void testFilePlusTextSharing_TextExclusionDoesNotAffectAlternativeIntent() { Uri uri = createTestContentProviderUri("image/png", null); Intent sendIntent = createSendImageIntent(uri); @@ -825,6 +828,7 @@ public class UnbundledChooserActivityTest { } @Test + @Ignore("b/285309527") public void testImagePlusTextSharing_failedThumbnailAndExcludedText_textChanges() { Uri uri = createTestContentProviderUri("image/png", null); Intent sendIntent = createSendImageIntent(uri); -- cgit v1.2.3-59-g8ed1b