Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show the nearby chip for images and files too." into rvc-dev am: bb2d9a52c1 am: fe25cc3bb6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11756600

Change-Id: I18648f5dd059ac412695d0a565668d1384ad03fb
This commit is contained in:
Daniel Sandler
2020-06-08 20:23:26 +00:00
committed by Automerger Merge Worker
parent f40041df55 fe25cc3bb6
commit 4b2314666f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1121,7 +1121,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);
@@ -1285,6 +1285,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();
@@ -1395,10 +1401,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)) {