From b8ee27f013766d6c89befa36bd265c6104ffb036 Mon Sep 17 00:00:00 2001
From: Andrew Stadler <stadler@android.com>
Date: Wed, 30 Sep 2009 10:07:25 -0700
Subject: [PATCH] Add "deselect all"

* New menu items in MessageList
* Show/hide menu item if anything is checked
* Clear the selected items map, redraw listview, hide button panel

Bug # 2116257
---
 .../ic_menu_email_deselect_mail.png             | Bin 0 -> 2976 bytes
 .../ic_menu_email_deselect_mail.png             | Bin 0 -> 5346 bytes
 res/menu/message_list_option.xml                |   6 ++++++
 res/menu/message_list_option_smart_folder.xml   |   6 ++++++
 res/values/strings.xml                          |   2 ++
 src/com/android/email/activity/MessageList.java |  16 ++++++++++++++++
 6 files changed, 30 insertions(+)
 create mode 100755 res/drawable-hdpi/ic_menu_email_deselect_mail.png
 create mode 100755 res/drawable-mdpi/ic_menu_email_deselect_mail.png

diff --git a/res/drawable-hdpi/ic_menu_email_deselect_mail.png b/res/drawable-hdpi/ic_menu_email_deselect_mail.png
new file mode 100755
index 0000000000000000000000000000000000000000..0858538a8b5aadb028cc840f30f8acf6c75cffde
GIT binary patch
literal 2976
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
WIvm2EoUX(G0000<MNUMnLSTYLMxvbn

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_email_deselect_mail.png b/res/drawable-mdpi/ic_menu_email_deselect_mail.png
new file mode 100755
index 0000000000000000000000000000000000000000..78bac88bc13b902f39bdc3dc89d2904080517286
GIT binary patch
literal 5346
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
ZUWBg@n}sc)j!ysUh<9+aKV`dv_aD<JJ#GL1

literal 0
HcmV?d00001

diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index aec8f2d8c..dd9de911f 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -27,6 +27,12 @@
         android:title="@string/compose_action"
         android:icon="@*android:drawable/ic_menu_compose"
     />
+    <group android:id="@+id/deselect_all_group">
+        <item android:id="@+id/deselect_all"
+            android:title="@string/deselect_all_action"
+            android:icon="@drawable/ic_menu_email_deselect_mail"
+        />
+    </group>
     <item android:id="@+id/folders"
         android:title="@string/folders_action"
         android:icon="@drawable/ic_menu_folder"
diff --git a/res/menu/message_list_option_smart_folder.xml b/res/menu/message_list_option_smart_folder.xml
index fc1eb64a5..f88963a93 100644
--- a/res/menu/message_list_option_smart_folder.xml
+++ b/res/menu/message_list_option_smart_folder.xml
@@ -31,4 +31,10 @@
         android:title="@string/accounts_action"
         android:icon="@*android:drawable/ic_menu_account_list"
     />
+    <group android:id="@+id/deselect_all_group">
+        <item android:id="@+id/deselect_all"
+            android:title="@string/deselect_all_action"
+            android:icon="@drawable/ic_menu_email_deselect_mail"
+        />
+    </group>
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 43bf198af..bf09f7c0c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -99,6 +99,8 @@
     <!-- Menu item -->
     <string name="add_account_action">Add account</string>
     <!-- Menu item -->
+    <string name="deselect_all_action">Deselect all</string>
+    <!-- Menu item -->
     <string name="compose_action">Compose</string>
     <!-- Menu item/button name -->
     <string name="search_action">Search</string>
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 9337b1457..25d9c8b1d 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -412,6 +412,13 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        boolean showDeselect = mListAdapter.getSelectedSet().size() > 0;
+        menu.setGroupVisible(R.id.deselect_all_group, showDeselect);
+        return true;
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -430,6 +437,9 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
             case R.id.account_settings:
                 onEditAccount();
                 return true;
+            case R.id.deselect_all:
+                onDeselectAll();
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -545,6 +555,12 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         AccountSettings.actionSettings(this, lookupAccountIdFromMailboxId(mMailboxId));
     }
 
+    private void onDeselectAll() {
+        mListAdapter.getSelectedSet().clear();
+        mListView.invalidateViews();
+        showMultiPanel(false);
+    }
+
     private void onOpenMessage(long messageId, long mailboxId) {
         // TODO: Should not be reading from DB in UI thread
         EmailContent.Mailbox mailbox = EmailContent.Mailbox.restoreMailboxWithId(this, mailboxId);