update android remote_control app for android-studio, new icons, added GPL

[goodguy/history.git] / CineRmt / src / main / java / com / local / cinermt / ConfigActivity.java

diff --git a/CineRmt/src/com/local/cinermt/ConfigActivity.java b/CineRmt/src/main/java/com/local/cinermt/ConfigActivity.java
similarity index 97%
rename from CineRmt/src/com/local/cinermt/ConfigActivity.java
rename to CineRmt/src/main/java/com/local/cinermt/ConfigActivity.java
index 81ae01888bca3fb8ef8584b8a8817fff861ba311..b076e025689ee6c4e87d8627a3d44d3991f35818 100644 (file)
--- a/CineRmt/src/com/local/cinermt/ConfigActivity.java
+++ b/CineRmt/src/main/java/com/local/cinermt/ConfigActivity.java
@@ -42,7 +42,7 @@ public class ConfigActivity extends Activity implements OnClickListener {
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
-               getMenuInflater().inflate(R.menu.activity_main, menu);
+               getMenuInflater().inflate(R.menu.menu_main, menu);
                return true;
        }