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

Commit 53fcd667 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '7057-t-faulty_share_intent' into 'v1-t' 

Revert "base: ChooserActivity: Don't show image edit button on multiple targets"

See merge request e/os/android_frameworks_base!157
parents f8d64094 2aa6f7f0

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

+2 −5
Original line number Diff line number Diff line
@@ -1416,18 +1416,15 @@ 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());

        if (shouldNearbyShareBeIncludedAsActionButton()) {

            addActionButton(actionRow, createNearbyButton(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);

            if (!validForContentPreview(uri)) {