add options menu

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
new file mode 100644 (file)
index 0000000..6fd0da1
--- /dev/null
+++ b/res/menu/main_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />
+    <item android:id="@+id/settings"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/settings" />
+</menu>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d321d3c58bc39c354fb0e9ebeb48494accc71274..91ad670eeb12bcc8043e1a997356a7be4a87b656 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,6 +5,8 @@
     <string name="failure">Неудача</string>
     <string name="lasttry">Последнее обновление</string>
     <string name="failtry">Неудачная попытка</string>
+    <string name="quit">Выход</string>
+    <string name="settings">Конфигурация</string>
     <string-array name="month">
         <item>января</item>
         <item>февраля</item>

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 988f1fb53149b88be2f366ce151d50483db5e3e6..2323f5421f0800c2d3c90175d432055144af8f4f 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -16,6 +16,9 @@ import android.content.res.Resources;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.View;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
@@ -217,4 +220,27 @@ public class WhereAmI extends Activity
         boolean wifion = wifiman.setWifiEnabled(false);
         Log.w("WhereAmI", "disabling wifi result " + wifion);
     }
+
+    /** Called when the menu is activated. */
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_menu, menu);
+        return true;
+    }
+
+    /** Called when the menu item is selected */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.quit:
+            finish();
+            return true;
+        case R.id.settings:
+            Log.w("WhereAmI", "settings requested");
+            return true;
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
 }