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

Commit 67098d1a authored by Ray Chen's avatar Ray Chen
Browse files

Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent... 

Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar.

b:6046544
Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
parent 3fb40bd6

res/menu-land/photo.xml

+1 −10
Original line number Diff line number Diff line
@@ -30,16 +30,7 @@ 
            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

            android:visible="false"

            android:showAsAction="ifRoom">

        <menu>

            <item android:id="@+id/action_confirm_delete"

                    android:icon="@drawable/ic_menu_trash_holo_light"

                    android:title="@string/confirm_delete" />

            <item android:id="@+id/action_cancel_delete"

                    android:icon="@drawable/ic_menu_cancel_holo_light"

                    android:title="@string/cancel" />

        </menu>

    </item>

            android:showAsAction="ifRoom" />

    <item android:id="@+id/action_slideshow"

            android:icon="@drawable/ic_menu_slideshow_holo_light"

            android:title="@string/slideshow"

res/menu/operation.xml

+1 −7
Original line number Diff line number Diff line
@@ -30,13 +30,7 @@ 
            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

            android:visible="false"

            android:showAsAction="ifRoom">

        <menu>

            <item android:id="@+id/action_confirm_delete"

                    android:icon="@drawable/ic_menu_trash_holo_light"

                    android:title="@string/confirm_delete" />

        </menu>

    </item>

            android:showAsAction="ifRoom" />

    <item android:id="@+id/action_edit"

            android:title="@string/edit"

            android:showAsAction="never"

res/menu/photo.xml

+1 −7
Original line number Diff line number Diff line
@@ -30,13 +30,7 @@ 
            android:icon="@drawable/ic_menu_trash_holo_light"

            android:title="@string/delete"

            android:visible="false"

            android:showAsAction="never">

        <menu>

            <item android:id="@+id/action_confirm_delete"

                    android:icon="@drawable/ic_menu_trash_holo_light"

                    android:title="@string/confirm_delete" />

        </menu>

    </item>

            android:showAsAction="never" />

    <item android:id="@+id/action_slideshow"

            android:icon="@drawable/ic_menu_slideshow_holo_light"

            android:title="@string/slideshow"

res/values/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ 


    <!-- Details dialog "OK" button. Dismisses dialog. -->

    <string name="delete">Delete</string>

    <string name="confirm_delete">Delete</string>

    <string name="confirm_action">Confirm deletion?</string>

    <string name="confirm">Confirm</string>

    <string name="cancel">Cancel</string>

    <string name="share">Share</string>

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

+5 −3
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ public class PhotoPage extends ActivityState 


        DataManager manager = mActivity.getDataManager();

        int action = item.getItemId();

        boolean needsConfirm = false;

        switch (action) {

            case android.R.id.home: {

                if (mSetPathString != null) {
@@ -480,20 +481,21 @@ public class PhotoPage extends ActivityState 
                }

                return true;

            }

            case R.id.action_delete:

                needsConfirm = true;

            case R.id.action_setas:

            case R.id.action_confirm_delete:

            case R.id.action_rotate_ccw:

            case R.id.action_rotate_cw:

            case R.id.action_show_on_map:

            case R.id.action_edit:

                mSelectionManager.deSelectAll();

                mSelectionManager.toggle(path);

                mMenuExecutor.onMenuClicked(item, null);

                mMenuExecutor.onMenuClicked(item, needsConfirm, null);

                return true;

            case R.id.action_import:

                mSelectionManager.deSelectAll();

                mSelectionManager.toggle(path);

                mMenuExecutor.onMenuClicked(item,

                mMenuExecutor.onMenuClicked(item, needsConfirm,

                        new ImportCompleteListener(mActivity));

                return true;

            default :