ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use Fragment's context menu API."

Browse Source
This commit is contained in:
Makoto Onuki 2010-06-14 15:04:21 -07:00 committed by Android (Google) Code Review
commit 3cbf0267eb
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/email/activity/MailboxList.java
View File

@ -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
*/

4
src/com/android/email/activity/MailboxListFragment.java
View File

@ -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();

12
src/com/android/email/activity/MessageList.java
View File

@ -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) {

6
src/com/android/email/activity/MessageListFragment.java
View File

@ -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();