diff --git a/TODO b/TODO index 158f6cd6de3977c147c07eb1fa8a8e70e852d95a..c937599b14a5c1a832e0ec332272fb7e2c13c260 100644 --- a/TODO +++ b/TODO @@ -14,7 +14,6 @@ - Change navbar first-open mechanics to match Android design docs - Pull out internal I2P web browser, or disable it - What will this require elsewhere? -- Add link from Log Activity to Logging settings # Short-term diff --git a/src/net/i2p/android/router/log/LogActivity.java b/src/net/i2p/android/router/log/LogActivity.java index 7b4d9a30b94acd36b3adecf27146acad67ee675f..2802a691831e00e6c0a19ea77c39fbbad5266679 100644 --- a/src/net/i2p/android/router/log/LogActivity.java +++ b/src/net/i2p/android/router/log/LogActivity.java @@ -2,9 +2,14 @@ package net.i2p.android.router.log; import net.i2p.android.router.I2PActivityBase; import net.i2p.android.router.R; +import net.i2p.android.router.SettingsActivity; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBar; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.widget.ArrayAdapter; import android.widget.SpinnerAdapter; @@ -68,6 +73,35 @@ public class LogActivity extends I2PActivityBase implements } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.activity_main_actions, menu); + // Help menu not needed (yet), hide + menu.findItem(R.id.menu_help).setVisible(false); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_settings: + Intent intent = new Intent(LogActivity.this, SettingsActivity.class); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { + intent.setAction("net.i2p.android.router.PREFS_LOGGING"); + } else { // TODO: Test if this works, fix if not + Bundle args = new Bundle(); + args.putString("settings", "logging"); + intent.putExtras(args); + } + startActivity(intent); + return true; + + default: + return super.onOptionsItemSelected(item); + } + } + @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState);