summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAayush Gupta <aayushgupta219@gmail.com>2022-07-04 12:41:30 +0000
committeralk3pInjection <webmaster@raspii.tech>2022-08-05 21:35:03 +0800
commit8e34e4cdcdcc933846515f0432d1412231e9975e (patch)
treebfb7bd51340f338ec5cc6b06bf5da9ab322f99a1
parent6bf5529a1dc2fe7c6269298fa98a0982f6cea2d5 (diff)
base: ChooserActivity: Don't show image edit button on multiple targetsHEADsugisawa-mr1
Ie52aaab90f678d32d9b67f95d81f86b82d1b9c7c introduced edit button but didn't took into account that there can be multiple images being shared. This patch adds a check to ensure that this action is not shown in such cases. Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com> Change-Id: I787cd9cfd873242542b330a522bed5df9deb62a4
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 7bb1ed8abc0a..57f668fe2f2f 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1394,13 +1394,16 @@ public class ChooserActivity extends ResolverActivity implements
final ViewGroup actionRow =
(ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row);
+ String action = targetIntent.getAction();
+
//TODO: addActionButton(actionRow, createCopyButton());
addActionButton(actionRow, createNearbyButton(targetIntent));
- addActionButton(actionRow, createEditButton(targetIntent));
+ if (!Intent.ACTION_SEND_MULTIPLE.equals(action)) {
+ addActionButton(actionRow, createEditButton(targetIntent));
+ }
mPreviewCoord = new ContentPreviewCoordinator(contentPreviewLayout, false);
- String action = targetIntent.getAction();
if (Intent.ACTION_SEND.equals(action)) {
Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM);
imagePreview.findViewById(R.id.content_preview_image_1_large)