diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f15375..cff7d4c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,8 @@ + + @@ -34,28 +36,20 @@ - - - + + + + + - - - - - - - - - - - - + @@ -65,16 +59,7 @@ - - - - - - - - - - + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java index 5867044..d7b2a6d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java @@ -122,16 +122,10 @@ @Override public void onDestroy() { + super.onDestroy(); } -// -// @Override -// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { -// inflater.inflate(R.menu.main,menu); -// super.onCreateOptionsMenu(menu, inflater); -// } - public boolean onOptionsItemSelected(MenuItem item){ int id = item.getItemId();