Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 010f71bdb0289f0aa88a397eb908e3e3b6169841..473dfeb2115077123f3dd144ea7505a9848dbff3 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -5,31 +5,26 @@
     android:versionName="1.0" >\r
 \r
     <uses-sdk\r
-        android:minSdkVersion="9"\r
-        android:targetSdkVersion="9" />\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
 \r
     <application\r
         android:name=".android.Application"\r
-        android:debuggable="true"\r
         android:icon="@drawable/or_launcher"\r
         android:killAfterRestore="true"\r
-        android:label="@string/app_name" >\r
+        android:label="@string/app_name"\r
+        android:theme="@style/AppTheme" >\r
         <activity\r
             android:name=".android.Main"\r
-            android:theme="@android:style/Theme.Black.NoTitleBar" >\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:name=".android.rocket.OpenRocketLoaderActivity"\r
-            android:theme="@android:style/Theme.Black.NoTitleBar" >\r
-\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
@@ -63,7 +58,7 @@
         </activity>\r
         <activity\r
             android:name=".android.rocket.OpenRocketViewer"\r
-            android:label="@string/app_name" />\r
+            android:windowSoftInputMode="adjustPan" />\r
         <activity android:name=".android.PreferencesActivity" >\r
             <intent-filter>\r
                 <action android:name="net.sf.openrocket.android.PreferencesActivity" />\r
@@ -72,10 +67,20 @@
             </intent-filter>\r
         </activity>\r
         <activity android:name=".android.motor.MotorBrowserActivity" />\r
-        <activity android:name=".android.motor.BurnPlotActivity" />\r
-        <activity android:name=".android.thrustcurve.TCQueryActivity" />\r
-        <activity android:name=".android.simulation.SimulationViewActivity" />\r
-        <activity android:name=".android.filebrowser.SimpleFileBrowser" />\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