Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd61d96 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 69a6ef4c 1ed91f78

core/java/com/android/internal/app/ChooserActivity.java

+12 −5
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ public class ChooserActivity extends ResolverActivity { 
        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);
@@ -1097,6 +1097,13 @@ public class ChooserActivity extends ResolverActivity { 
            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();
@@ -1207,10 +1214,10 @@ public class ChooserActivity extends ResolverActivity { 
        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)) {