From e4427f4f17c5355450c2549cac9ededf753b2167 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Wed, 25 Nov 2009 16:21:01 +0000
Subject: [PATCH] Added a "show no widgets" entry into the widgets rotation.

Eventually, we should have a preference per account for whether listview
starts in no-widgets or flag mode.
---
 res/layout/message_list_item.xml              |  3 +-
 .../android/email/activity/MessageList.java   | 37 +++++++++++++++----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index ae67d4ed5..d615d1500 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -25,6 +25,7 @@
         android:paddingLeft="10dip"
         android:layout_toLeftOf="@id/widgets"
         android:layout_toRightOf="@+id/chip"
+        android:layout_alignWithParentIfMissing="true"
         android:layout_marginRight="1dip" />
     <TextView
         android:id="@+id/date"
@@ -39,7 +40,7 @@
         android:layout_toLeftOf="@id/widgets"
         android:layout_alignParentBottom="true"
         android:background="@android:color/transparent"
-
+        android:layout_alignWithParentIfMissing="true"
         />
       <TextView
          android:id="@+id/from"
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 5b01c9ef1..5691519c1 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -95,9 +95,10 @@ public class MessageList extends K9ListActivity
     private static final String STATE_KEY_SELECTION = "com.android.email.activity.messagelist_selection";
 
 
-    private static final int WIDGET_FLAG = 1;
-    private static final int WIDGET_DELETE = 2;
-    private static final int WIDGET_MULTISELECT = 3;
+    private static final int WIDGET_NONE = 1;
+    private static final int WIDGET_FLAG = 2;
+    private static final int WIDGET_DELETE = 3;
+    private static final int WIDGET_MULTISELECT = 4;
 
     private static final int[] colorChipResIds = new int[]
     {
@@ -729,6 +730,10 @@ public class MessageList extends K9ListActivity
             {
                 mSelectedWidget=WIDGET_MULTISELECT;
             }
+            else if (mSelectedWidget == WIDGET_MULTISELECT)
+            {
+                mSelectedWidget=WIDGET_NONE;
+            }
             else
             {
                 mSelectedWidget=WIDGET_FLAG;
@@ -738,17 +743,21 @@ public class MessageList extends K9ListActivity
         else
         {
             if (mSelectedWidget == WIDGET_FLAG)
+            {
+                mSelectedWidget=WIDGET_NONE;
+            }
+            else if (mSelectedWidget == WIDGET_NONE)
             {
                 mSelectedWidget=WIDGET_MULTISELECT;
             }
-            else if (mSelectedWidget == WIDGET_DELETE)
-            {
-                mSelectedWidget=WIDGET_FLAG;
-            }
-            else
+            else if (mSelectedWidget == WIDGET_MULTISELECT)
             {
                 mSelectedWidget=WIDGET_DELETE;
             }
+            else // if (mSelectedWidget == WIDGET_DELETE)
+            {
+                mSelectedWidget=WIDGET_FLAG;
+            }
 
 
 
@@ -773,6 +782,18 @@ public class MessageList extends K9ListActivity
             return;
         }
 
+        if (nextWidget == WIDGET_NONE)
+        {
+            v.findViewById(R.id.widgets).setVisibility(View.GONE);
+            return;
+        }
+        else
+        {
+            v.findViewById(R.id.widgets).setVisibility(View.VISIBLE);
+        }
+
+
+
         if (nextWidget == WIDGET_DELETE)
         {