diff options
| author | Samuel Holland <samuel@sholland.org> | 2017-08-17 06:06:35 -0500 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2017-08-17 06:06:35 -0500 |
| commit | 85fc5e7ebfbde91aaaff94e7ba89ca15c3c2a81c (patch) | |
| tree | 00c7349b2f313fae50ae74ba75a5db9dcc7af498 /app/src/main/java | |
| parent | 416d3adda740337432255f7a8425be7da4c84a74 (diff) | |
ConfigListFragment: Restore the non-FAB add menu
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/com/wireguard/android/ConfigActivity.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/com/wireguard/android/ConfigListFragment.java | 12 |
2 files changed, 15 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 fb565e96..bd455be8 100644 --- a/app/src/main/java/com/wireguard/android/ConfigActivity.java +++ b/app/src/main/java/com/wireguard/android/ConfigActivity.java @@ -95,6 +95,9 @@ public class ConfigActivity extends BaseConfigActivity { case android.R.id.home: onBackPressed(); return true; + case R.id.menu_action_add: + startActivity(new Intent(this, ConfigAddActivity.class)); + return true; case R.id.menu_action_edit: isEditing = true; switchToFragment(mainContainer, TAG_EDIT, true); diff --git a/app/src/main/java/com/wireguard/android/ConfigListFragment.java b/app/src/main/java/com/wireguard/android/ConfigListFragment.java index ed21ac00..ab87571b 100644 --- a/app/src/main/java/com/wireguard/android/ConfigListFragment.java +++ b/app/src/main/java/com/wireguard/android/ConfigListFragment.java @@ -7,6 +7,7 @@ import android.util.Log; import android.view.ActionMode; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -28,6 +29,17 @@ public class ConfigListFragment extends BaseConfigFragment { private ListView listView; @Override + public void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + + @Override + public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { + inflater.inflate(R.menu.config_list, menu); + } + + @Override public View onCreateView(final LayoutInflater inflater, final ViewGroup parent, final Bundle savedInstanceState) { final ConfigListFragmentBinding binding = |