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

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4ea14ab7..473dfeb2 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -6,60 +6,81 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="8" />
+        android:targetSdkVersion="15" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:debuggable="true"
+        android:name=".android.Application"
         android:icon="@drawable/or_launcher"
         android:killAfterRestore="true"
         android:label="@string/app_name"
-        android:name=".android.Application" >
-        <activity android:name=".android.Main" >
-            <intent-filter >
+        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" >
-            <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.



+            -->
+            <!-- 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.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data
                     android:host="*"
+                    android:mimeType="*/*"
                     android:pathPattern=".*\\.ork"
-                    android:scheme="content" />
+                    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 >
+            <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:label="@string/MotorListTitle"
-            android:name=".android.motor.MotorHierarchicalBrowser" >
-        </activity>
-        <activity android:name=".android.motor.MotorDetails" />
+            android:name=".android.motor.BurnPlotActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:label="@string/MotorListTitle"
-            android:name=".android.thrustcurve.TCQueryActivity" >
-        </activity>
-        <activity android:name=".android.simulation.SimulationViewer" />
+            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