Merge "Allow text toggle for shares from sysui." into main

3 files changed, 11 insertions, 5 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
index 4166e5ae..2af5881f 100644
--- a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
@@ -184,7 +184,8 @@ public final class ChooserContentPreviewUi {
                             imageLoader,
                             typeClassifier,
                             headlineGenerator,
-                            metadata
+                            metadata,
+                            chooserRequest.getCallerAllowsTextToggle()
                     );
             if (previewData.getUriCount() > 0) {
                 JavaFlowHelper.collectToList(
diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
index 30161cfb..da701ec4 100644
--- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
@@ -62,6 +62,7 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
     private final CharSequence mMetadata;
     private final boolean mIsSingleImage;
     private final int mFileCount;
+    private final boolean mAllowTextToggle;
     private ViewGroup mContentPreviewView;
     private View mHeadliveView;
     private boolean mIsMetadataUpdated = false;
@@ -70,8 +71,6 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
     private boolean mAllImages;
     private boolean mAllVideos;
     private int mPreviewSize;
-    // TODO(b/285309527): make this a flag
-    private static final boolean SHOW_TOGGLE_CHECKMARK = false;
 
     FilesPlusTextContentPreviewUi(
             CoroutineScope scope,
@@ -83,7 +82,8 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
             ImageLoader imageLoader,
             MimeTypeClassifier typeClassifier,
             HeadlineGenerator headlineGenerator,
-            @Nullable CharSequence metadata) {
+            @Nullable CharSequence metadata,
+            boolean allowTextToggle) {
         if (isSingleImage && fileCount != 1) {
             throw new IllegalArgumentException(
                     "fileCount = " + fileCount + " and isSingleImage = true");
@@ -98,6 +98,7 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
         mTypeClassifier = typeClassifier;
         mHeadlineGenerator = headlineGenerator;
         mMetadata = metadata;
+        mAllowTextToggle = allowTextToggle;
     }
 
     @Override
@@ -234,7 +235,7 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
             shareTextAction.accept(!isChecked);
             updateHeadline(headlineView, mFileCount, mAllImages, mAllVideos);
         });
-        if (SHOW_TOGGLE_CHECKMARK) {
+        if (mAllowTextToggle) {
             includeText.setVisibility(View.VISIBLE);
         }
     }
diff --git a/java/src/com/android/intentresolver/data/model/ChooserRequest.kt b/java/src/com/android/intentresolver/data/model/ChooserRequest.kt
index 60cc9e05..ad338103 100644
--- a/java/src/com/android/intentresolver/data/model/ChooserRequest.kt
+++ b/java/src/com/android/intentresolver/data/model/ChooserRequest.kt
@@ -30,6 +30,7 @@ import androidx.annotation.StringRes
 import com.android.intentresolver.ContentTypeHint
 import com.android.intentresolver.IChooserInteractiveSessionCallback
 import com.android.intentresolver.ext.hasAction
+import com.android.systemui.shared.Flags.screenshotContextUrl
 
 const val ANDROID_APP_SCHEME = "android-app"
 
@@ -196,4 +197,7 @@ data class ChooserRequest(
     }
 
     val payloadIntents = listOf(targetIntent) + additionalTargets
+
+    val callerAllowsTextToggle =
+        screenshotContextUrl() && "com.android.systemui".equals(referrerPackage)
 }