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

Per request, change the confirm dialog message to "Delete the selected item(s)?"

b: 6046544

Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65

2 files changed, 8 insertions, 7 deletions

diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index d8e60d3a2..c5773ed3e 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -125,14 +125,15 @@ public class ActionModeHandler implements ActionMode.Callback {
                 }
             }
             ProgressListener listener = null;
-            boolean needsConfirm = false;
+            String confirmMsg = null;
             int action = item.getItemId();
             if (action == R.id.action_import) {
                 listener = new ImportCompleteListener(mActivity);
             } else if (item.getItemId() == R.id.action_delete) {
-                needsConfirm = true;
+                confirmMsg = mActivity.getResources().getQuantityString(
+                        R.plurals.delete_selection, mSelectionManager.getSelectedCount());
             }
-            mMenuExecutor.onMenuClicked(item, needsConfirm, listener);
+            mMenuExecutor.onMenuClicked(item, confirmMsg, listener);
             if (action == R.id.action_select_all) {
                 updateSupportedOperation();
                 updateSelectionMenu();
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index 636da3985..14bdc4d53 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -232,14 +232,14 @@ public class MenuExecutor {
         startAction(action, title, listener);
     }
 
-    public void onMenuClicked(MenuItem menuItem, boolean needsConfirm,
+    public void onMenuClicked(MenuItem menuItem, String confirmMsg,
             final ProgressListener listener) {
         final int action = menuItem.getItemId();
 
-        if (needsConfirm) {
+        if (confirmMsg != null) {
             new AlertDialog.Builder(mActivity.getAndroidContext())
-                    .setMessage(R.string.confirm_action)
-                    .setPositiveButton(R.string.confirm, new OnClickListener() {
+                    .setMessage(confirmMsg)
+                    .setPositiveButton(R.string.ok, new OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 onMenuClicked(action, listener);
                             }