Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1d73587ba49b5e5181f2b34ab5c934e2685585d3..473dfeb2115077123f3dd144ea7505a9848dbff3 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -6,60 +6,81 @@
 \r
     <uses-sdk\r
         android:minSdkVersion="8"\r
-        android:targetSdkVersion="8" />\r
+        android:targetSdkVersion="15" />\r
 \r
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />\r
     <uses-permission android:name="android.permission.INTERNET" />\r
 \r
     <application\r
-        android:debuggable="true"\r
-        android:icon="@drawable/ic_launcher"\r
+        android:name=".android.Application"\r
+        android:icon="@drawable/or_launcher"\r
         android:killAfterRestore="true"\r
         android:label="@string/app_name"\r
-        android:name=".android.Application" >\r
-        <activity android:name=".android.Main" >\r
-            <intent-filter >\r
+        android:theme="@style/AppTheme" >\r
+        <activity\r
+            android:name=".android.Main"\r
+            android:theme="@style/AppTheme.NoActionBar" >\r
+            <intent-filter>\r
                 <action android:name="android.intent.action.MAIN" />\r
 \r
                 <category android:name="android.intent.category.LAUNCHER" />\r
             </intent-filter>\r
-        </activity>\r
-        <activity\r
-            android:label="@string/app_name"\r
-            android:name=".android.rocket.OpenRocketViewer" >\r
-            <intent-filter >\r
+            <!--\r
+                 I don't understand why I need to have two different intent filters. \r
+                               Combining the <data> elements into a single field did not result in a working \r
+                               application. The first intent-filter (with mimeType wildcard) convinces the \r
+                               file browser to associate the correct launcher icon. the second intent-filter \r
+                               is actually invoked when a file is selected.\r\r\r\r
+            -->\r
+            <!-- this intent filter convinces the file browser to display icons -->\r
+            <intent-filter>\r
                 <action android:name="android.intent.action.VIEW" />\r
 \r
-                <category android:name="android.intent.category.BROWSABLE" />\r
                 <category android:name="android.intent.category.DEFAULT" />\r
 \r
                 <data\r
                     android:host="*"\r
+                    android:mimeType="*/*"\r
                     android:pathPattern=".*\\.ork"\r
-                    android:scheme="content" />\r
+                    android:scheme="file" />\r
+            </intent-filter>\r
+            <!-- this intent is sent when a file is selected in file browser -->\r
+            <intent-filter>\r
+                <action android:name="android.intent.action.VIEW" />\r
+\r
+                <category android:name="android.intent.category.DEFAULT" />\r
+\r
                 <data\r
                     android:host="*"\r
                     android:pathPattern=".*\\.ork"\r
                     android:scheme="file" />\r
             </intent-filter>\r
         </activity>\r
+        <activity\r
+            android:name=".android.rocket.OpenRocketViewer"\r
+            android:windowSoftInputMode="adjustPan" />\r
         <activity android:name=".android.PreferencesActivity" >\r
-            <intent-filter >\r
+            <intent-filter>\r
                 <action android:name="net.sf.openrocket.android.PreferencesActivity" />\r
 \r
                 <category android:name="android.intent.category.PREFERENCE" />\r
             </intent-filter>\r
         </activity>\r
+        <activity android:name=".android.motor.MotorBrowserActivity" />\r
         <activity\r
-            android:label="@string/MotorListTitle"\r
-            android:name=".android.motor.MotorHierarchicalBrowser" >\r
-        </activity>\r
-        <activity android:name=".android.motor.MotorDetails" />\r
+            android:name=".android.motor.BurnPlotActivity"\r
+            android:theme="@style/AppTheme.NoActionBar" />\r
         <activity\r
-            android:label="@string/MotorListTitle"\r
-            android:name=".android.thrustcurve.TCQueryActivity" >\r
-        </activity>\r
-        <activity android:name=".android.simulation.SimulationViewer" />\r
+            android:name=".android.thrustcurve.TCQueryActivity"\r
+            android:theme="@style/Theme.Sherlock.Dialog" />\r
+        <activity\r
+            android:name=".android.simulation.SimulationViewActivity"\r
+            android:theme="@style/AppTheme.NoActionBar" />\r
+        <activity\r
+            android:name=".android.filebrowser.SimpleFileBrowser"\r
+            android:theme="@style/Theme.Sherlock.Dialog" />\r
+\r
+        <service android:name=".android.simservice.SimulationService" />\r
     </application>\r
 \r
 </manifest>
\ No newline at end of file