From: gitknilch <gitknilch@cwde.de>
Date: Sat, 9 Mar 2013 18:07:47 +0000 (+0100)
Subject: use andriod defaults for "ok" and "cancel"
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/commitdiff_plain/27afcc3975e4251c42d5262f01191635c2eaa060?ds=sidebyside

use andriod defaults for "ok" and "cancel"

Change-Id: I00ccad95a4878cfe0994293c9b5d39b44172c262
Signed-off-by: gitknilch <gitknilch@cwde.de>
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ffa59f..9510be0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,7 +36,5 @@ Get the source code: https://code.google.com/p/freeshisen/</string>
     <string name="zerotime">00:00:00</string>
     <string name="clearhiscore_confirm_title">Really clear best times?</string>
     <string name="clearhiscore_confirm_text">This will clear all saved times. Hit &quot;OK&quot; if you really want to do this.</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/de/cwde/freeshisen/HighscoreActivity.java b/src/de/cwde/freeshisen/HighscoreActivity.java
index 0af0372..70d5f3d 100644
--- a/src/de/cwde/freeshisen/HighscoreActivity.java
+++ b/src/de/cwde/freeshisen/HighscoreActivity.java
@@ -42,7 +42,7 @@ public class HighscoreActivity extends Activity {
 		builder.setMessage(R.string.clearhiscore_confirm_text);
 		builder.setTitle(R.string.clearhiscore_confirm_title);
 
-		builder.setPositiveButton(R.string.ok,
+		builder.setPositiveButton(android.R.string.ok,
 				new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						// User clicked OK button - delete hiscores
@@ -65,7 +65,7 @@ public class HighscoreActivity extends Activity {
 						editor.commit();
 					}
 				});
-		builder.setNegativeButton(R.string.cancel,
+		builder.setNegativeButton(android.R.string.cancel,
 				new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						// User cancelled the dialog - nothing to do
diff --git a/src/de/cwde/freeshisen/ShisenShoActivity.java b/src/de/cwde/freeshisen/ShisenShoActivity.java
index 88666da..376e054 100644
--- a/src/de/cwde/freeshisen/ShisenShoActivity.java
+++ b/src/de/cwde/freeshisen/ShisenShoActivity.java
@@ -28,8 +28,6 @@ public class ShisenShoActivity extends Activity {
 		PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		//getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-		//		WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
 		view = ShisenSho.app().getView();
 		ShisenSho.app().activity = this;