Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream
[debian/openrocket] / android / AndroidManifest.xml
index e660bb6f7a4237cf34f1c0a6226a69f40977d2ae..473dfeb2115077123f3dd144ea7505a9848dbff3 100644 (file)
@@ -1,62 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
-       package="net.sf.openrocket" android:versionCode="1"\r
-       android:versionName="1.0">\r
+    package="net.sf.openrocket"\r
+    android:versionCode="1"\r
+    android:versionName="1.0" >\r
 \r
-       <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />\r
+    <uses-sdk\r
+        android:minSdkVersion="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
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />\r
+    <uses-permission android:name="android.permission.INTERNET" />\r
 \r
-       <application android:debuggable="true" android:icon="@drawable/or_launcher"\r
-               android:killAfterRestore="true" android:label="@string/app_name"\r
-               android:name=".android.Application">\r
-               <activity android:name=".android.Main">\r
-                       <intent-filter>\r
-                               <action android:name="android.intent.action.MAIN" />\r
+    <application\r
+        android:name=".android.Application"\r
+        android:icon="@drawable/or_launcher"\r
+        android:killAfterRestore="true"\r
+        android:label="@string/app_name"\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 android:label="@string/app_name" android:name=".android.rocket.OpenRocketViewer">\r
-\r
-                       <!-- I don't understand why I need to have two different intent filters. \r
+                <category android:name="android.intent.category.LAUNCHER" />\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
-                       <intent-filter>\r
-                               <action android:name="android.intent.action.VIEW" />\r
-\r
-                               <category android:name="android.intent.category.DEFAULT" />\r
-\r
-                               <data android:host="*" android:mimeType="*/*"\r
-                                       android:pathPattern=".*\\.ork" android:scheme="file" />\r
-                       </intent-filter>\r
-                       <intent-filter>\r
-                               <action android:name="android.intent.action.VIEW" />\r
-\r
-                               <category android:name="android.intent.category.DEFAULT" />\r
-\r
-                               <data android:host="*" android:pathPattern=".*\\.ork"\r
-                                       android:scheme="file" />\r
-                       </intent-filter>\r
-               </activity>\r
-               <activity android:name=".android.PreferencesActivity">\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:label="@string/MotorListTitle"\r
-                       android:name=".android.motor.MotorHierarchicalBrowser" />\r
-               <activity android:name=".android.motor.MotorDetails" />\r
-               <activity android:label="@string/MotorListTitle"\r
-                       android:name=".android.thrustcurve.TCQueryActivity" />\r
-               <activity android:name=".android.simulation.SimulationViewer" />\r
-               <activity android:name=".android.simulation.GraphicalActivity" />\r
-\r
-       </application>\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.DEFAULT" />\r
+\r
+                <data\r
+                    android:host="*"\r
+                    android:mimeType="*/*"\r
+                    android:pathPattern=".*\\.ork"\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
+                <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:name=".android.motor.BurnPlotActivity"\r
+            android:theme="@style/AppTheme.NoActionBar" />\r
+        <activity\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