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

Commit d72971e6 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Fixed crop intent." into gb-ub-photos-arches

parents 15aff7c3 5aa454b3

AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line
@@ -243,7 +243,12 @@ 
                <data android:mimeType="image/*" />

            </intent-filter>

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

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

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

                <data android:scheme="http" />

                <data android:scheme="https" />

                <data android:scheme="content" />

                <data android:scheme="file" />

                <data android:scheme="" />

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

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

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

res/values/filtershow_strings.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


<resources>



    <!--  Name for the image editor activity [CHAR LIMIT=NONE]-->

    <string name="app_name">FilterShow</string>

    <!--  Title for the image editor activity [CHAR LIMIT=NONE]-->

    <string name="title_activity_filter_show">FilterShowActivity</string>

    <string name="title_activity_filter_show">Photo Editor</string>



    <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->

    <string name="cannot_load_image">Cannot load the image!</string>

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

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

        OnShareTargetSelectedListener {



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

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

    public static final String TINY_PLANET_ACTION = "com.android.camera.action.TINY_PLANET";

    public static final String LAUNCH_FULLSCREEN = "launch-fullscreen";

    private final PanelController mPanelController = new PanelController();

src/com/android/gallery3d/ui/MenuExecutor.java

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.gallery3d.data.DataManager; 
import com.android.gallery3d.data.MediaItem;

import com.android.gallery3d.data.MediaObject;

import com.android.gallery3d.data.Path;

import com.android.gallery3d.filtershow.FilterShowActivity;

import com.android.gallery3d.util.Future;

import com.android.gallery3d.util.GalleryUtils;

import com.android.gallery3d.util.ThreadPool.Job;
@@ -226,7 +227,8 @@ public class MenuExecutor { 
                }

                return;

            case R.id.action_crop: {

                Intent intent = getIntentBySingleSelectedPath(CropImage.ACTION_CROP);

                Intent intent = getIntentBySingleSelectedPath(FilterShowActivity.CROP_ACTION)

                        .setClass((Activity) mActivity, FilterShowActivity.class);

                ((Activity) mActivity).startActivity(intent);

                return;

            }