summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java6
-rw-r--r--java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java4
2 files changed, 9 insertions, 1 deletions
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);