Removed start/stop and reload buttons from main menu

res/menu/activity_main_actions.xml → res/menu/fragment_main_actions.xml

 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:i2pandroid="http://schemas.android.com/apk/res-auto">
-    <item android:title="@string/action_router_start"
-          android:id="@+id/menu_start"
-          android:icon="@drawable/ic_av_play"
-          i2pandroid:showAsAction="ifRoom" >
-    </item>
-    <item android:title="@string/action_router_stop"
-          android:id="@+id/menu_stop"
-          android:icon="@drawable/ic_av_stop"
-          i2pandroid:showAsAction="ifRoom" >
-    </item>
-    <item android:title="@string/action_reload"
-          android:id="@+id/menu_reload"
-          android:icon="@drawable/ic_navigation_refresh"
-          i2pandroid:showAsAction="ifRoom" >
-    </item>
     <item android:title="@string/menu_settings"
           android:id="@+id/menu_settings"
           android:icon="@android:drawable/ic_menu_preferences"

src/net/i2p/android/router/activity/I2PActivityBase.java

@@ -16,7 +16,6 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBar.Tab;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -232,31 +231,11 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
         super.onDestroy();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.activity_main_actions, menu);
-        return true;
-    }
-
     /**
      * Called whenever we call invalidateOptionsMenu()
      */
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        // add/hide items here
-        RouterService svc = _routerService;
-        boolean showStart = ((svc == null) || (!_isBound) || svc.canManualStart()) &&
-                            Util.isConnected(this);
-        MenuItem start = menu.findItem(R.id.menu_start);
-        start.setVisible(showStart);
-        start.setEnabled(showStart);
-
-        boolean showStop = svc != null && _isBound && svc.canManualStop();
-        MenuItem stop = menu.findItem(R.id.menu_stop);
-        stop.setVisible(showStop);
-        stop.setEnabled(showStop);
-
         // If the nav drawer is open, hide action items related to the content view
         boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
         onDrawerChange(drawerOpen);

src/net/i2p/android/router/fragment/MainFragment.java

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -197,6 +199,11 @@ public class MainFragment extends I2PFragmentBase {
         updateOneShot();
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_main_actions, menu);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         if(_savedStatus != null) {