Merge "Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""

2 files changed, 17 insertions, 13 deletions

diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index fbe582523..91a98ceb4 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -86,6 +86,7 @@ public class ActionModeHandler implements ActionMode.Callback {
         mSelectionMenu = customMenu.addDropDownMenu(
                 (Button) customView.findViewById(R.id.selection_menu),
                 R.menu.selection);
+        updateSelectAllTitle();
         customMenu.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(MenuItem item) {
                 return onActionItemClicked(actionMode, item);
@@ -118,21 +119,24 @@ public class ActionModeHandler implements ActionMode.Callback {
         result = mMenuExecutor.onMenuClicked(item, listener);
         if (item.getItemId() == R.id.action_select_all) {
             updateSupportedOperation();
+            updateSelectAllTitle();
+        }
+        return result;
+    }
 
-            // For clients who call SelectionManager.selectAll() directly, we need to ensure the
-            // menu status is consistent with selection manager.
-            item = mSelectionMenu.findItem(R.id.action_select_all);
-            if (item != null) {
-                if (mSelectionManager.inSelectAllMode()) {
-                    item.setChecked(true);
-                    item.setTitle(R.string.deselect_all);
-                } else {
-                    item.setChecked(false);
-                    item.setTitle(R.string.select_all);
-                }
+    private void updateSelectAllTitle() {
+        // For clients who call SelectionManager.selectAll() directly, we need to ensure the
+        // menu status is consistent with selection manager.
+        MenuItem item = mSelectionMenu.findItem(R.id.action_select_all);
+        if (item != null) {
+            if (mSelectionManager.inSelectAllMode()) {
+                item.setChecked(true);
+                item.setTitle(R.string.deselect_all);
+            } else {
+                item.setChecked(false);
+                item.setTitle(R.string.select_all);
             }
         }
-        return result;
     }
 
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
diff --git a/src/com/android/gallery3d/ui/SelectionManager.java b/src/com/android/gallery3d/ui/SelectionManager.java
index b85ca7a41..9599f5b3f 100644
--- a/src/com/android/gallery3d/ui/SelectionManager.java
+++ b/src/com/android/gallery3d/ui/SelectionManager.java
@@ -73,9 +73,9 @@ public class SelectionManager {
     }
 
     public void selectAll() {
-        enterSelectionMode();
         mInverseSelection = true;
         mClickedSet.clear();
+        enterSelectionMode();
         if (mListener != null) mListener.onSelectionModeChange(SELECT_ALL_MODE);
     }