X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=473dfeb2115077123f3dd144ea7505a9848dbff3;hb=e21b77118f72c9c82ef379b3d044f042371f6d04;hp=e660bb6f7a4237cf34f1c0a6226a69f40977d2ae;hpb=e7ddfde48a8f0f43b519b4bca6dbc2acad0477a4;p=debian%2Fopenrocket

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e660bb6f..473dfeb2 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,62 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="net.sf.openrocket" android:versionCode="1"
-	android:versionName="1.0">
+    package="net.sf.openrocket"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="15" />
 
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
-	<application android:debuggable="true" android:icon="@drawable/or_launcher"
-		android:killAfterRestore="true" android:label="@string/app_name"
-		android:name=".android.Application">
-		<activity android:name=".android.Main">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
+    <application
+        android:name=".android.Application"
+        android:icon="@drawable/or_launcher"
+        android:killAfterRestore="true"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".android.Main"
+            android:theme="@style/AppTheme.NoActionBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity android:label="@string/app_name" android:name=".android.rocket.OpenRocketViewer">
-
-			<!-- I don't understand why I need to have two different intent filters. 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <!--
+                 I don't understand why I need to have two different intent filters. 
 				Combining the <data> elements into a single field did not result in a working 
 				application. The first intent-filter (with mimeType wildcard) convinces the 
 				file browser to associate the correct launcher icon. the second intent-filter 
-				is actually invoked when a file is selected. -->
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:host="*" android:mimeType="*/*"
-					android:pathPattern=".*\\.ork" android:scheme="file" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:host="*" android:pathPattern=".*\\.ork"
-					android:scheme="file" />
-			</intent-filter>
-		</activity>
-		<activity android:name=".android.PreferencesActivity">
-			<intent-filter>
-				<action android:name="net.sf.openrocket.android.PreferencesActivity" />
-
-				<category android:name="android.intent.category.PREFERENCE" />
-			</intent-filter>
-		</activity>
-		<activity android:label="@string/MotorListTitle"
-			android:name=".android.motor.MotorHierarchicalBrowser" />
-		<activity android:name=".android.motor.MotorDetails" />
-		<activity android:label="@string/MotorListTitle"
-			android:name=".android.thrustcurve.TCQueryActivity" />
-		<activity android:name=".android.simulation.SimulationViewer" />
-		<activity android:name=".android.simulation.GraphicalActivity" />
-
-	</application>
+				is actually invoked when a file is selected.



+            -->
+            <!-- this intent filter convinces the file browser to display icons -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.ork"
+                    android:scheme="file" />
+            </intent-filter>
+            <!-- this intent is sent when a file is selected in file browser -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.ork"
+                    android:scheme="file" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".android.rocket.OpenRocketViewer"
+            android:windowSoftInputMode="adjustPan" />
+        <activity android:name=".android.PreferencesActivity" >
+            <intent-filter>
+                <action android:name="net.sf.openrocket.android.PreferencesActivity" />
+
+                <category android:name="android.intent.category.PREFERENCE" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".android.motor.MotorBrowserActivity" />
+        <activity
+            android:name=".android.motor.BurnPlotActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".android.thrustcurve.TCQueryActivity"
+            android:theme="@style/Theme.Sherlock.Dialog" />
+        <activity
+            android:name=".android.simulation.SimulationViewActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".android.filebrowser.SimpleFileBrowser"
+            android:theme="@style/Theme.Sherlock.Dialog" />
+
+        <service android:name=".android.simservice.SimulationService" />
+    </application>
 
 </manifest>
\ No newline at end of file