From 2aa8ea4399dd70c26d6c0679ff002fb16fdc5bff Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 14 Jun 2010 14:49:02 -0700
Subject: [PATCH] Use Fragment's context menu API.

Change-Id: I1be6b17ff5bc7fd5258366bc064251c6f79c0cc8
---
 src/com/android/email/activity/MailboxList.java    | 14 --------------
 .../email/activity/MailboxListFragment.java        |  4 +++-
 src/com/android/email/activity/MessageList.java    | 12 ------------
 .../email/activity/MessageListFragment.java        |  6 ++++--
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index c141e4baa..d1fff35d1 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -201,20 +201,6 @@ public class MailboxList extends Activity implements OnClickListener, MailboxLis
         }
     }
 
-    // TODO eliminate this, when possible, and do it entirely in the fragment
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo info) {
-        super.onCreateContextMenu(menu, v, info);
-        mListFragment.onCreateContextMenu(menu, v, info);
-    }
-
-    // TODO eliminate this, when possible, and do it entirely in the fragment
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        mListFragment.onContextItemSelected(item);
-        return super.onContextItemSelected(item);
-    }
-
     /**
      * Implements MailboxFragment.Callback
      */
diff --git a/src/com/android/email/activity/MailboxListFragment.java b/src/com/android/email/activity/MailboxListFragment.java
index 5d99f9689..ff6236a72 100644
--- a/src/com/android/email/activity/MailboxListFragment.java
+++ b/src/com/android/email/activity/MailboxListFragment.java
@@ -95,7 +95,7 @@ public class MailboxListFragment extends Fragment implements OnItemClickListener
         mListView = (ListView) inflater.inflate(R.layout.mailbox_list_fragment, container, false);
         mListView.setOnItemClickListener(this);
         mListView.setItemsCanFocus(false);
-        mActivity.registerForContextMenu(mListView);    // TODO This will be removed when possible
+        registerForContextMenu(mListView);
 
         mListAdapter = new MailboxesAdapter(mActivity);
         mListView.setAdapter(mListAdapter);
@@ -158,6 +158,7 @@ public class MailboxListFragment extends Fragment implements OnItemClickListener
      * This is called via the activity
      * TODO This will be removed when possible
      */
+    @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo info) {
         AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) info;
         Cursor c = (Cursor) mListView.getItemAtPosition(menuInfo.position);
@@ -175,6 +176,7 @@ public class MailboxListFragment extends Fragment implements OnItemClickListener
      * This is called via the activity
      * TODO This will be removed when possible
      */
+    @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterView.AdapterContextMenuInfo info =
             (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index bb48b5449..e49808a1d 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -343,18 +343,6 @@ public class MessageList extends Activity implements OnClickListener,
         }
     }
 
-    // TODO Move these two method to the fragment.
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        mListFragment.createContextMenu(menu, v, menuInfo);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        return mListFragment.onContextItemSelected(item);
-    }
-
     private void onFolders() {
         long mailboxId = mListFragment.getMailboxId();
         if (mailboxId >= 0) {
diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index 46df5d35f..1dad83cd5 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -180,7 +180,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         mListView = (ListView) inflater.inflate(R.layout.message_list_fragment, container, false);
         mListView.setOnItemClickListener(this);
         mListView.setItemsCanFocus(false);
-        mActivity.registerForContextMenu(mListView);
+        registerForContextMenu(mListView);
 
         mListAdapter = new MessagesAdapter(mActivity, new Handler(), this);
         mListView.setAdapter(mListAdapter);
@@ -328,7 +328,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         onMultiDelete(mListAdapter.getSelectedSet());
     }
 
-    public void createContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
         // There is no context menu for the list footer
         if (info.targetView == mListFooterView) {
@@ -368,6 +369,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         }
     }
 
+    @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterView.AdapterContextMenuInfo info =
                 (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();