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

Commit 63926d2e authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Added support for crop actions. Changed overflow menu to use new editor. 

Bug: 7281479
Bug: 7337191
Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
parent 43b906d8

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -255,6 +255,13 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="image/*" />

            </intent-filter>

            <intent-filter android:label="@string/crop_label">

                <action android:name="com.android.camera.action.CROP" />

                <data android:mimeType="image/*" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.ALTERNATIVE" />

                <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />

            </intent-filter>

        </activity>



        <uses-library android:name="com.google.android.media.effects"

src/com/android/gallery3d/app/PhotoPage.java

+5 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.gallery3d.data.SecureSource; 
import com.android.gallery3d.data.SnailAlbum;

import com.android.gallery3d.data.SnailItem;

import com.android.gallery3d.data.SnailSource;

import com.android.gallery3d.filtershow.FilterShowActivity;

import com.android.gallery3d.picasasource.PicasaSource;

import com.android.gallery3d.ui.AnimationTime;

import com.android.gallery3d.ui.DetailsHelper;
@@ -995,9 +996,10 @@ public class PhotoPage extends ActivityState implements 
            }

            case R.id.action_crop: {

                Activity activity = mActivity;

                Intent intent = new Intent(CropImage.CROP_ACTION);

                intent.setClass(activity, CropImage.class);

                intent.setData(manager.getContentUri(path));

                Intent intent = new Intent(FilterShowActivity.CROP_ACTION);

                intent.setClass(activity, FilterShowActivity.class);

                intent.setDataAndType(manager.getContentUri(path), current.getMimeType())

                    .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

                activity.startActivityForResult(intent, PicasaSource.isPicasaImage(current)

                        ? REQUEST_CROP_PICASA

                        : REQUEST_CROP);

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import java.util.Vector; 
public class FilterShowActivity extends Activity implements OnItemClickListener,

        OnShareTargetSelectedListener {



    public static final String CROP_ACTION = "com.android.camera.action.CROP";

    private final PanelController mPanelController = new PanelController();

    private ImageLoader mImageLoader = null;

    private ImageShow mImageShow = null;
@@ -344,6 +345,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
        } else {

            pickImage();

        }



        String action = intent.getAction();

        if (action == CROP_ACTION){

            mPanelController.showComponent(findViewById(R.id.cropButton));

        }



    }



    private int getScreenImageSize() {