From 2a05bc0caa45da00b9360d61d35153269d63e5db Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 12 Sep 2012 17:20:53 +0200
Subject: [PATCH] Use ActionBarSherlock's MenuBuilder for the "more" menu

---
 res/layout/message_list_item.xml            |  2 +-
 src/com/fsck/k9/activity/MessageList.java   | 11 +++++--
 src/com/fsck/k9/view/ImageButtonAnchor.java | 36 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 src/com/fsck/k9/view/ImageButtonAnchor.java

diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 8ae9e9986..e5910005c 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -61,7 +61,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorPrimary" />
 
-    <ImageButton
+    <com.fsck.k9.view.ImageButtonAnchor
         android:id="@+id/item_menu"
         android:layout_width="36dp"
         android:layout_height="wrap_content"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index a2c75d012..1cc0377de 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -47,6 +47,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.internal.view.menu.MenuBuilder;
+import com.actionbarsherlock.internal.view.menu.MenuPopupHelper;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -2051,13 +2053,16 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
                 onToggleFlag(Arrays.asList(new MessageInfoHolder[]{message}));
             }
         };
-        
+
         private final OnClickListener itemMenuClickListener = new OnClickListener() {
             @Override
             public void onClick(View v) {
                 // Perform action on clicks
-                setAllSelected(false);
-                openContextMenu(v);
+//                setAllSelected(false);
+//                openContextMenu(v);
+                MenuBuilder menu = new MenuBuilder(MessageList.this);
+                menu.add("something");
+                new MenuPopupHelper(MessageList.this, menu, v).show();
             }
         };
 
diff --git a/src/com/fsck/k9/view/ImageButtonAnchor.java b/src/com/fsck/k9/view/ImageButtonAnchor.java
new file mode 100644
index 000000000..1a84de478
--- /dev/null
+++ b/src/com/fsck/k9/view/ImageButtonAnchor.java
@@ -0,0 +1,36 @@
+package com.fsck.k9.view;
+
+import com.actionbarsherlock.internal.view.View_HasStateListenerSupport;
+import com.actionbarsherlock.internal.view.View_OnAttachStateChangeListener;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageButton;
+
+
+public class ImageButtonAnchor extends ImageButton implements View_HasStateListenerSupport {
+
+    public ImageButtonAnchor(Context context) {
+        super(context);
+    }
+
+    public ImageButtonAnchor(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ImageButtonAnchor(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void addOnAttachStateChangeListener(View_OnAttachStateChangeListener listener) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void removeOnAttachStateChangeListener(View_OnAttachStateChangeListener listener) {
+        // TODO Auto-generated method stub
+
+    }
+}