diff --git a/res/menu/activity_base_actions.xml b/res/menu/activity_base_actions.xml
index ab07512ef3e0bea97b7f33623e237f853c8ca98a..0a648e8a0327c826963b8d8ac6a97accce205d15 100755
--- a/res/menu/activity_base_actions.xml
+++ b/res/menu/activity_base_actions.xml
@@ -5,8 +5,9 @@
android:icon="@android:drawable/ic_menu_preferences"
i2pandroid:showAsAction="never" >
</item>
+ <!-- Hide for now
<item android:title="@string/menu_help"
android:id="@+id/menu_help"
i2pandroid:showAsAction="never" >
- </item>
+ </item> -->
</menu>
diff --git a/res/menu/activity_main_actions.xml b/res/menu/activity_main_actions.xml
index 067cdaba468027166e1322937b369434530e16c9..553f48810672558453833ef10171c4534eb6ffc9 100755
--- a/res/menu/activity_main_actions.xml
+++ b/res/menu/activity_main_actions.xml
@@ -4,4 +4,11 @@
android:id="@+id/menu_about"
i2pandroid:showAsAction="never" >
</item>
+ <!-- Show directly here for now -->
+ <item android:id="@+id/menu_help_licenses"
+ android:title="@string/label_licenses"
+ i2pandroid:showAsAction="never" />
+ <item android:id="@+id/menu_help_release_notes"
+ android:title="@string/label_release_notes"
+ i2pandroid:showAsAction="never" />
</menu>
diff --git a/res/menu/fragment_addressbook_actions.xml b/res/menu/fragment_addressbook_actions.xml
index 6f35889cbd8fd5bcfd454b9f6dd853da0ba16904..8e370fefd8c33d52f3c119e8be752ec1e03eed32 100644
--- a/res/menu/fragment_addressbook_actions.xml
+++ b/res/menu/fragment_addressbook_actions.xml
@@ -13,7 +13,8 @@
<item android:id="@+id/action_addressbook_settings"
android:title="@string/menu_settings"
i2pandroid:showAsAction="never" />
+ <!-- Hide for now
<item android:id="@+id/action_addressbook_help"
android:title="@string/menu_help"
- i2pandroid:showAsAction="never" />
+ i2pandroid:showAsAction="never" /> -->
</menu>
diff --git a/res/menu/fragment_i2ptunnel_list_actions.xml b/res/menu/fragment_i2ptunnel_list_actions.xml
index c82477bc789584812603acd10eeba10c451dc396..15f87d0aa41b71c4a174ac1371102852a85a25dd 100644
--- a/res/menu/fragment_i2ptunnel_list_actions.xml
+++ b/res/menu/fragment_i2ptunnel_list_actions.xml
@@ -14,8 +14,9 @@
<item android:id="@+id/action_restart_all_tunnels"
android:title="@string/action_i2ptunnel_restart_all"
i2pandroid:showAsAction="never" />
+ <!-- Hide for now
<item android:id="@+id/action_i2ptunnel_help"
android:title="@string/menu_help"
- i2pandroid:showAsAction="never" />
+ i2pandroid:showAsAction="never" /> -->
</menu>
diff --git a/src/net/i2p/android/i2ptunnel/TunnelListFragment.java b/src/net/i2p/android/i2ptunnel/TunnelListFragment.java
index 846dbf177afaf7dfe72cadb935dfaded26cf87b7..0661d08df29b0f872529d0f99249c15bdef5b6f5 100644
--- a/src/net/i2p/android/i2ptunnel/TunnelListFragment.java
+++ b/src/net/i2p/android/i2ptunnel/TunnelListFragment.java
@@ -187,11 +187,12 @@ public class TunnelListFragment extends ListFragment implements
case R.id.action_restart_all_tunnels:
msgs = mGroup.restartAllControllers();
break;
- case R.id.action_i2ptunnel_help:
- Intent hi = new Intent(getActivity(), HelpActivity.class);
- hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
- startActivity(hi);
- return true;
+ // TODO: Enable when Help page finished
+ //case R.id.action_i2ptunnel_help:
+ // Intent hi = new Intent(getActivity(), HelpActivity.class);
+ // hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
+ // startActivity(hi);
+ // return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/src/net/i2p/android/router/MainActivity.java b/src/net/i2p/android/router/MainActivity.java
index 24983413e5ea4daabc6a4420705319c99cc8f98e..5e01517ef7eec0b31661f26a0775318dc9e4ff36 100644
--- a/src/net/i2p/android/router/MainActivity.java
+++ b/src/net/i2p/android/router/MainActivity.java
@@ -15,6 +15,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import net.i2p.android.router.R;
import net.i2p.android.router.dialog.AboutDialog;
+import net.i2p.android.router.dialog.TextResourceDialog;
import net.i2p.android.router.service.IRouterState;
import net.i2p.android.router.service.IRouterStateCallback;
import net.i2p.android.router.service.RouterService;
@@ -91,10 +92,26 @@ public class MainActivity extends I2PActivityBase implements
dialog.show(getSupportFragmentManager(), "about");
return true;
- case R.id.menu_help:
- Intent hi = new Intent(MainActivity.this, HelpActivity.class);
- hi.putExtra(HelpActivity.REFERRER, "main");
- startActivity(hi);
+ // TODO: Unhide when Help page finished
+ //case R.id.menu_help:
+ // Intent hi = new Intent(MainActivity.this, HelpActivity.class);
+ // hi.putExtra(HelpActivity.REFERRER, "main");
+ // startActivity(hi);
+ // return true;
+
+ // TODO: Remove when help page finished
+ case R.id.menu_help_licenses:
+ Intent lic = new Intent(MainActivity.this, LicenseActivity.class);
+ startActivity(lic);
+ return true;
+ case R.id.menu_help_release_notes:
+ TextResourceDialog rDdialog = new TextResourceDialog();
+ Bundle args = new Bundle();
+ args.putString(TextResourceDialog.TEXT_DIALOG_TITLE,
+ getResources().getString(R.string.label_release_notes));
+ args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
+ rDdialog.setArguments(args);
+ rDdialog.show(getSupportFragmentManager(), "release_notes");
return true;
default:
diff --git a/src/net/i2p/android/router/addressbook/AddressbookFragment.java b/src/net/i2p/android/router/addressbook/AddressbookFragment.java
index f532f552d532548f8616de872a64ea0c20c7943c..1b46d0bb60843fafda36f094a48235d9b447548f 100644
--- a/src/net/i2p/android/router/addressbook/AddressbookFragment.java
+++ b/src/net/i2p/android/router/addressbook/AddressbookFragment.java
@@ -180,11 +180,12 @@ public class AddressbookFragment extends ListFragment implements
Intent si = new Intent(getActivity(), AddressbookSettingsActivity.class);
startActivity(si);
return true;
- case R.id.action_addressbook_help:
- Intent hi = new Intent(getActivity(), HelpActivity.class);
- hi.putExtra(HelpActivity.REFERRER, "addressbook");
- startActivity(hi);
- return true;
+ // TODO: Enable when Help page finished
+ //case R.id.action_addressbook_help:
+ // Intent hi = new Intent(getActivity(), HelpActivity.class);
+ // hi.putExtra(HelpActivity.REFERRER, "addressbook");
+ // startActivity(hi);
+ // return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/src/net/i2p/android/router/log/LogActivity.java b/src/net/i2p/android/router/log/LogActivity.java
index 476e46fbed845c371e61fbc988f03c8d08c7a40e..4aa19172219409aa248ad254e643850047a3917d 100644
--- a/src/net/i2p/android/router/log/LogActivity.java
+++ b/src/net/i2p/android/router/log/LogActivity.java
@@ -78,7 +78,8 @@ public class LogActivity extends I2PActivityBase implements
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.activity_base_actions, menu);
// Help menu not needed (yet), hide
- menu.findItem(R.id.menu_help).setVisible(false);
+ // TODO: Unhide when Help finished
+ //menu.findItem(R.id.menu_help).setVisible(false);
return super.onCreateOptionsMenu(menu);
}