From: Andy Spencer Date: Tue, 23 Apr 2013 06:01:34 +0000 (+0000) Subject: Change Exit to Quit and return to home screen X-Git-Url: http://pileus.org/git/?p=~andy%2Fspades;a=commitdiff_plain;h=0faf3ef54ec1c06b23dc5c5a9bf0912e9e7b4395 Change Exit to Quit and return to home screen --- diff --git a/res/menu/main.xml b/res/menu/main.xml index bd7ec6f..f54f24c 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -6,6 +6,6 @@ android:title="Disconnect" /> - + diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java index 07c4ace..568d617 100644 --- 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;