Renamed and reorganized menu images for easier replacing

astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java

@@ -287,7 +287,7 @@ public class TagUpdatesFragment extends ListFragment {
         if(actFmPreferenceService.isLoggedIn()) {
             item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
-            item.setIcon(R.drawable.ic_menu_refresh);
+            item.setIcon(R.drawable.icn_menu_refresh);
         }
     }
 

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm;
 
-import com.todoroo.astrid.helper.AsyncImageView;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -52,6 +50,7 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.Update;
+import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
 import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.TagDataService;
@@ -159,7 +158,7 @@ public class TagViewFragment extends TaskListFragment {
     @Override
     protected void addSyncRefreshMenuItem(Menu menu) {
         if(actFmPreferenceService.isLoggedIn()) {
-            addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.ic_menu_refresh, MENU_REFRESH_ID, false);
+            addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.icn_menu_refresh, MENU_REFRESH_ID, false);
         } else {
             super.addSyncRefreshMenuItem(menu);
         }

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java

@@ -146,7 +146,7 @@ public class GtasksListFragment extends SubtasksListFragment {
     @Override
     protected void addSyncRefreshMenuItem(Menu menu) {
         if(gtasksPreferenceService.isLoggedIn()) {
-            addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.ic_menu_refresh, MENU_REFRESH_ID, false);
+            addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.icn_menu_refresh, MENU_REFRESH_ID, false);
         } else {
             super.addSyncRefreshMenuItem(menu);
         }

astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -1026,7 +1026,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         if(actFmPreferenceService.isLoggedIn() && remoteId > 0 && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null) {
             MenuItem item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
-            item.setIcon(R.drawable.ic_menu_refresh);
+            item.setIcon(R.drawable.icn_menu_refresh);
         }
         super.onPrepareOptionsMenu(menu);
     }

astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

@@ -363,7 +363,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     }
 
     protected void addSyncRefreshMenuItem(Menu menu) {
-        addMenuItem(menu, R.string.TLA_menu_sync, R.drawable.ic_menu_refresh, MENU_SYNC_ID, true);
+        addMenuItem(menu, R.string.TLA_menu_sync, R.drawable.icn_menu_refresh, MENU_SYNC_ID, true);
     }
 
     protected void addMenuItem(Menu menu, int title, int imageRes, int id, boolean showAsAction) {
@@ -398,18 +398,18 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
 
         // --- sort
         if (allowResorting()) {
-            addMenuItem(menu, R.string.TLA_menu_sort, android.R.drawable.ic_menu_sort_by_size, MENU_SORT_ID, true);
+            addMenuItem(menu, R.string.TLA_menu_sort, R.drawable.icn_menu_sort_by_size, MENU_SORT_ID, true);
         }
 
         // --- sync
         addSyncRefreshMenuItem(menu);
 
         // --- new filter
-        addMenuItem(menu, R.string.FLA_new_filter, android.R.drawable.ic_menu_add, MENU_NEW_FILTER_ID, true);
+        addMenuItem(menu, R.string.FLA_new_filter, R.drawable.icn_menu_add, MENU_NEW_FILTER_ID, true);
 
         // --- addons
         if (!Constants.MARKET_DISABLED) {
-            addMenuItem(menu, R.string.TLA_menu_addons, android.R.drawable.ic_menu_set_as, MENU_ADDONS_ID, false);
+            addMenuItem(menu, R.string.TLA_menu_addons, R.drawable.icn_menu_set_as, MENU_ADDONS_ID, false);
         }
 
         // ask about plug-ins

astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java

@@ -58,12 +58,12 @@ public class MainMenuPopover extends FragmentPopover {
 
     private void addFixedItems(boolean isTablet) {
         if (!isTablet)
-            addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
+            addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_lists, MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
         // addMenuItem(R.string.TLA_menu_friends, R.drawable.icn_friends, MAIN_MENU_ITEM_FRIENDS, null, topFixed); // Friends item
         // addMenuItem(R.string.TLA_menu_suggestions, R.drawable.icn_featured_lists, MAIN_MENU_ITEM_SUGGESTIONS, null, topFixed); // Suggestions item
-        addMenuItem(R.string.TLA_menu_tutorial, R.drawable.icn_tutorial, MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item
+        addMenuItem(R.string.TLA_menu_tutorial, R.drawable.icn_menu_tutorial, MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item
-        addMenuItem(R.string.TLA_menu_settings, R.drawable.icn_settings, MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
+        addMenuItem(R.string.TLA_menu_settings, R.drawable.icn_menu_settings, MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
-        addMenuItem(R.string.TLA_menu_support, R.drawable.icn_support, MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item
+        addMenuItem(R.string.TLA_menu_support, R.drawable.icn_menu_support, MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item
     }
 
     @Override