add options menu

[WhereAmI.git] / src / org / average / whereami / WhereAmI.java

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index e9c3c0349518c736b390abcf542cced79027b6f3..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;
@@ -53,6 +56,12 @@ public class WhereAmI extends Activity
                     tvs.append(tm.format(" %d/%m/%Y %H:%M:%S"));
                 }
             }
+
+            @Override
+            protected void onCancelled() {
+                Log.w("WhereAmI", "BgUpdate callback cancelled");
+                runningtasks--;
+            }
         }
 
         public UpdateTarget(TextView tv, Integer updater) {
@@ -211,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);
+        }
+    }
 }