Change Exit to Quit and return to home screen

diff --git a/res/menu/main.xml b/res/menu/main.xml
index bd7ec6f4e135ddf8ab2cc45106c51fd21e6751b5..f54f24cdadceebdc9f1881a4614d2193ed4c5db5 100644 (file)
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -6,6 +6,6 @@
                android:title="Disconnect" />
        <item android:id="@+id/settings"
                android:title="Settings" />
-       <item android:id="@+id/exit"
-               android:title="Exit" />
+       <item android:id="@+id/quit"
+               android:title="Quit" />
 </menu>

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index 07c4ace6cd3a6af9804103ca5e063b4be2d66fd2..568d617afe0f1121d3699447dfb464a205d8d142 100644 (file)
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -193,9 +193,13 @@ public class Main extends Activity
                                .putExtra("Command", Task.DISCONNECT));
        }
 
-       private void exit()
+       private void quit()
        {
                stopService(new Intent(this, Task.class));
+               Intent intent = new Intent(Intent.ACTION_MAIN);
+               intent.addCategory(Intent.CATEGORY_HOME);
+               intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+               startActivity(intent);
        }
 
        /* Widget callback functions */
@@ -351,9 +355,8 @@ public class Main extends Activity
                        case R.id.settings:
                                this.startActivity(new Intent(this, Prefs.class));
                                return true;
-                       case R.id.exit:
-                               this.exit();
-                               this.finish();
+                       case R.id.quit:
+                               this.quit();
                                return true;
                        default:
                                return false;