X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/d0e04237b00df7c11616f359200255a8b47e79d7..b5d364506be25f41b232f91f19c6aaf79a76c4dc:/AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a517c81..a276329 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,28 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="de.cwde.shisensho"
-      android:versionCode="1"
-      android:versionName="0.1">
-    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="10"></uses-sdk>
-
-
-	<application android:icon="@drawable/icon" android:label="@string/app_name"
-		android:name=".ShisenSho" android:allowBackup="true">
-		<activity android:name=".ShisenShoActivity"
-			android:screenOrientation="landscape">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity 
-		    android:name=".ShisenShoOptionsActivity"
-			android:screenOrientation="landscape">
-			<intent-filter>
-				<action android:name="de.cwde.shisensho.SETTINGS"/>
-				<category android:name="android.intent.category.DEFAULT"></category>
-			</intent-filter>
-		</activity>
-
-	</application>
+    package="de.cwde.freeshisen"
+    android:versionCode="1"
+    android:versionName="0.1" >
+
+    <uses-sdk
+        android:minSdkVersion="5"
+        android:targetSdkVersion="10" >
+
+        <!-- targetSdkVersion *must* be <=10 so we can show the legacy "menu" button -->
+    </uses-sdk>
+
+    <application
+        android:name="de.cwde.freeshisen.ShisenSho"
+        android:allowBackup="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name="de.cwde.freeshisen.ShisenShoActivity"
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="de.cwde.freeshisen.SettingsActivity"
+            android:parentActivityName="de.cwde.freeshisen.ShisenShoActivity"
+            android:screenOrientation="landscape" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="de.cwde.freeshisen.ShisenShoActivity" />
+
+            <intent-filter>
+                <action android:name="de.cwde.freeshisen.SETTINGS" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="de.cwde.freeshisen.HighscoreActivity"
+            android:parentActivityName="de.cwde.freeshisen.ShisenShoActivity"
+            android:screenOrientation="landscape" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="de.cwde.freeshisen.ShisenShoActivity" />
+
+            <intent-filter>
+                <action android:name="de.cwde.freeshisen.HISCORE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file