From 12dd51bd42b13ffd3b15f3b4048fc3e745d86c8e Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 12 Jan 2012 17:33:03 -0800 Subject: [PATCH] Removed some unecessary menu items, added some others (sync in tla, new list in fla) --- .../astrid/activity/FilterListActivity.java | 25 +++++++++++++------ .../astrid/activity/TaskListActivity.java | 11 ++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index 6621ac74b..89cf153c0 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -105,6 +105,7 @@ public class FilterListActivity extends ExpandableListFragment { private static final int MENU_HELP_ID = R.string.FLA_menu_help; private static final int MENU_REFRESH_ID = R.string.actfm_FLA_menu_refresh; private static final int MENU_NEW_FILTER_ID = R.string.FLA_new_filter; + private static final int MENU_NEW_LIST_ID = R.string.FLA_new_list; private static final String LAST_TAG_REFRESH_KEY = "last_tag_refresh"; //$NON-NLS-1$ @@ -256,19 +257,23 @@ public class FilterListActivity extends ExpandableListFragment { R.string.FLA_new_filter); item.setIcon(android.R.drawable.ic_menu_add); + item = menu.add(Menu.NONE, MENU_NEW_LIST_ID, Menu.NONE, + R.string.FLA_new_list); + item.setIcon(android.R.drawable.ic_menu_add); + item = menu.add(Menu.NONE, MENU_SEARCH_ID, Menu.NONE, R.string.FLA_menu_search); item.setIcon(android.R.drawable.ic_menu_search); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE, - R.string.TLA_menu_sync); - item.setIcon(R.drawable.ic_menu_refresh); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); +// item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE, +// R.string.TLA_menu_sync); +// item.setIcon(R.drawable.ic_menu_refresh); +// item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - item = menu.add(Menu.NONE, MENU_HELP_ID, 1, - R.string.FLA_menu_help); - item.setIcon(android.R.drawable.ic_menu_help); +// item = menu.add(Menu.NONE, MENU_HELP_ID, 1, +// R.string.FLA_menu_help); +// item.setIcon(android.R.drawable.ic_menu_help); } /* ====================================================================== @@ -454,6 +459,12 @@ public class FilterListActivity extends ExpandableListFragment { startActivity(intent); return true; } + case MENU_NEW_LIST_ID : { + Intent intent = TagsPlugin.newTagDialog(getActivity()); + startActivity(intent); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); + return true; + } case CONTEXT_MENU_SHORTCUT: { ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo)item.getMenuInfo(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 3df500eda..49bb2afe7 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -381,6 +381,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, MenuItem item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE, R.string.TLA_menu_sync); item.setIcon(R.drawable.ic_menu_refresh); + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } /** @@ -397,11 +398,11 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, addSyncRefreshMenuItem(menu); - if (!mDualFragments) { - item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE, - R.string.tag_TLA_menu); - item.setIcon(R.drawable.ic_menu_lists); - } +// if (!mDualFragments) { +// item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE, +// R.string.tag_TLA_menu); +// item.setIcon(R.drawable.ic_menu_lists); +// } if(!Constants.MARKET_DISABLED) { item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,