summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author 1 <mrcasey@google.com> 2023-04-25 19:17:58 +0000
committer 1 <mrcasey@google.com> 2023-04-26 19:24:59 +0000
commitc74648831207df9495dcb13bf08afdecdf30fa93 (patch)
tree03a354689cc5ff2eb962dafc3ac62a404d45af26 /java/src
parentf1107ce7b0771006130ac9fc49944f69d9594076 (diff)
Update file+share to align toggled text with mock.
When text is toggled off, it should say e.g. "Image only". Mock: https://www.figma.com/file/JVIcmg4OhWuO5Vc1UdPVxe/Sharesheet-(U)?node-id=66-5067&t=Wj5ulJXOpvpOPlYY-0 Bug: 279599021 Test: atest UnbundledChooserActivityTest Test: Manual test with ShareTest Change-Id: I85eecae3c24f348e355717b78b2cf23aa748f91a
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java28
1 files changed, 28 insertions, 0 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
index e15d53c4..5c42b4b7 100644
--- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
@@ -21,6 +21,7 @@ import static com.android.intentresolver.contentpreview.ContentPreviewType.CONTE
import android.content.res.Resources;
import android.text.util.Linkify;
+import android.util.PluralsMessageFormatter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -33,6 +34,7 @@ import com.android.intentresolver.widget.ActionRow;
import com.android.intentresolver.widget.ScrollableImagePreviewView;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;
@@ -175,9 +177,35 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
shareTextAction.accept(false);
includeText.setOnCheckedChangeListener((view, isChecked) -> {
textView.setEnabled(isChecked);
+ if (isChecked) {
+ textView.setText(mText);
+ } else {
+ textView.setText(getNoTextString(contentPreview.getResources()));
+ }
shareTextAction.accept(!isChecked);
updateHeadline(contentPreview);
});
includeText.setVisibility(View.VISIBLE);
}
+
+ private String getNoTextString(Resources resources) {
+ int stringResource;
+
+ if (mAllImages) {
+ stringResource = R.string.sharing_images_only;
+ } else if (mAllVideos) {
+ stringResource = R.string.sharing_videos_only;
+ } else {
+ stringResource = R.string.sharing_files_only;
+ }
+
+ HashMap<String, Object> params = new HashMap<>();
+ params.put("count", mFiles.size());
+
+ return PluralsMessageFormatter.format(
+ resources,
+ params,
+ stringResource
+ );
+ }
}