Merge branch 'master' of https://code.google.com/p/freeshisen

[FreeShisen] / src / de / cwde / freeshisen / ShisenShoActivity.java

diff --git a/src/de/cwde/freeshisen/ShisenShoActivity.java b/src/de/cwde/freeshisen/ShisenShoActivity.java
index 0478d07416286e8bf7172bebd64f96f4bdfee43a..376e054c58799d5465d79ee13aacfd75a2af53d9 100644 (file)
--- 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;
@@ -75,8 +73,11 @@ public class ShisenShoActivity extends Activity {
                case R.id.undo:
                case R.id.clean:
                        return view.onOptionsItemSelected(item);
+               case R.id.hiscore:
+                       startActivity(new Intent("de.cwde.freeshisen.HISCORE", null));
+                       return true;
                case R.id.options:
-                       startActivityForResult(new Intent("de.cwde.freeshisen.SETTINGS", null), 0);
+                       startActivity(new Intent("de.cwde.freeshisen.SETTINGS", null));
                        return true;
                case R.id.about:
                        onAboutActivate();