From b18b59fd5861c81aa0bce913207c0412d457c9f0 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Fri, 5 Jun 2020 12:35:56 -0400 Subject: [PATCH] Show the nearby chip for images and files too. This revealed that we weren't initializing the nearby intent from the original intent, so that's fixed too. This should ensure that flags and extras from the original intent make their way to the available and installed nearby component. Test: Share (an image and a non-image) from DocumentsUI Fixes: 155487375 Fixes: 155676993 Change-Id: If0c0b754a066b0ec439a866de3eae84caca7b793 --- .../android/internal/app/ChooserActivity.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 8f3edb8f1787b..402394d849be6 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -1124,7 +1124,7 @@ public class ChooserActivity extends ResolverActivity implements final ComponentName cn = getNearbySharingComponent(); if (cn == null) return null; - final Intent resolveIntent = new Intent(); + final Intent resolveIntent = new Intent(originalIntent); resolveIntent.setComponent(cn); final ResolveInfo ri = getPackageManager().resolveActivity( resolveIntent, PackageManager.GET_META_DATA); @@ -1288,6 +1288,12 @@ public class ChooserActivity extends ResolverActivity implements ViewGroup parent) { ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( R.layout.chooser_grid_preview_image, parent, false); + + final ViewGroup actionRow = + (ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row); + //TODO: addActionButton(actionRow, createCopyButton()); + addActionButton(actionRow, createNearbyButton(targetIntent)); + mPreviewCoord = new ContentPreviewCoordinator(contentPreviewLayout, true); String action = targetIntent.getAction(); @@ -1398,10 +1404,11 @@ public class ChooserActivity extends ResolverActivity implements ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( R.layout.chooser_grid_preview_file, parent, false); - // TODO(b/120417119): Disable file copy until after moving to sysui, - // due to permissions issues - //((ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row)) - // .addView(createCopyButton()); + final ViewGroup actionRow = + (ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row); + //TODO(b/120417119): addActionButton(actionRow, createCopyButton()); + addActionButton(actionRow, createNearbyButton(targetIntent)); + String action = targetIntent.getAction(); if (Intent.ACTION_SEND.equals(action)) {