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." am: bd8e5ae31c

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

Change-Id: I38f79f585072673d40ae8d3dab72cdd838b92c2c
This commit is contained in:
Alison Cichowlas
2020-08-13 14:27:28 +00:00
committed by Automerger Merge Worker
parent 33afbc9347 bd8e5ae31c
commit 6ff4300aa1
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

@@ -934,7 +934,7 @@ public class ChooserActivity extends ResolverActivity {
final ComponentName cn = getNearbySharingComponent(); final ComponentName cn = getNearbySharingComponent();
if (cn == null) return null; if (cn == null) return null;
final Intent resolveIntent = new Intent(); final Intent resolveIntent = new Intent(originalIntent);
resolveIntent.setComponent(cn); resolveIntent.setComponent(cn);
final ResolveInfo ri = getPackageManager().resolveActivity( final ResolveInfo ri = getPackageManager().resolveActivity(
resolveIntent, PackageManager.GET_META_DATA); resolveIntent, PackageManager.GET_META_DATA);
@@ -1101,6 +1101,13 @@ public class ChooserActivity extends ResolverActivity {
ViewGroup parent) { ViewGroup parent) {
ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
R.layout.chooser_grid_preview_image, parent, false); 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); mPreviewCoord = new ContentPreviewCoordinator(contentPreviewLayout, true);
String action = targetIntent.getAction(); String action = targetIntent.getAction();
@@ -1211,10 +1218,10 @@ public class ChooserActivity extends ResolverActivity {
ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
R.layout.chooser_grid_preview_file, parent, false); R.layout.chooser_grid_preview_file, parent, false);
// TODO(b/120417119): Disable file copy until after moving to sysui, final ViewGroup actionRow =
// due to permissions issues (ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row);
//((ViewGroup) contentPreviewLayout.findViewById(R.id.chooser_action_row)) //TODO(b/120417119): addActionButton(actionRow, createCopyButton());
// .addView(createCopyButton()); addActionButton(actionRow, createNearbyButton(targetIntent));
String action = targetIntent.getAction(); String action = targetIntent.getAction();
if (Intent.ACTION_SEND.equals(action)) { if (Intent.ACTION_SEND.equals(action)) {