diff options
| author | 2017-08-15 16:08:38 -0500 | |
|---|---|---|
| committer | 2017-08-15 16:08:38 -0500 | |
| commit | cfcda8bd132b9dae5cf9e0efcb06f7dd5b5850ad (patch) | |
| tree | 360ca4e1a51446c46c7ca35a05898344ba2a3c05 /app/src/main/java/com/wireguard/android/ConfigActivity.java | |
| parent | ConfigActivity: Show back arrow in single layout action bar (diff) | |
| download | wireguard-android-cfcda8bd132b9dae5cf9e0efcb06f7dd5b5850ad.tar.xz wireguard-android-cfcda8bd132b9dae5cf9e0efcb06f7dd5b5850ad.zip | |
BaseConfigActivity: Move menu handling to ConfigActivity
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/ConfigActivity.java')
| -rw-r--r-- | app/src/main/java/com/wireguard/android/ConfigActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/src/main/java/com/wireguard/android/ConfigActivity.java b/app/src/main/java/com/wireguard/android/ConfigActivity.java index 084f6c08..b3cde478 100644 --- a/app/src/main/java/com/wireguard/android/ConfigActivity.java +++ b/app/src/main/java/com/wireguard/android/ConfigActivity.java @@ -6,6 +6,7 @@ import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; import android.util.Log; +import android.view.Menu; import android.view.MenuItem; import com.wireguard.config.Config; @@ -49,6 +50,12 @@ public class ConfigActivity extends BaseConfigActivity { } @Override + public boolean onCreateOptionsMenu(final Menu menu) { + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override protected void onCurrentConfigChanged(final Config config) { Log.d(getClass().getSimpleName(), "onCurrentConfigChanged config=" + (config != null ? config.getName() : null) + " fragment=" + fm.findFragmentById(mainContainer) + |
