X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=473dfeb2115077123f3dd144ea7505a9848dbff3;hb=0956b7ce3e8f66e4ceeb3e25516a34117e7ffa48;hp=896a21de9e541a34d0d53b73feda50244e29ec79;hpb=9768d5385f667d12f5dc844ced55fb0f9e2b5eb2;p=debian%2Fopenrocket

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 896a21de..473dfeb2 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -6,36 +6,31 @@
 
     <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:name=".android.Application"
-        android:debuggable="true"
         android:icon="@drawable/or_launcher"
         android:killAfterRestore="true"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
         <activity
             android:name=".android.Main"
-            android:theme="@android:style/Theme.Black.NoTitleBar" >
+            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:name=".android.rocket.OpenRocketViewer"
-            android:label="@string/app_name" >
-
             <!--
                  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.


+				is actually invoked when a file is selected.



             -->
             <!-- this intent filter convinces the file browser to display icons -->
             <intent-filter>
@@ -61,6 +56,9 @@
                     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" />
@@ -68,15 +66,21 @@
                 <category android:name="android.intent.category.PREFERENCE" />
             </intent-filter>
         </activity>
+        <activity android:name=".android.motor.MotorBrowserActivity" />
         <activity
-            android:name=".android.motor.MotorHierarchicalBrowser"
-            android:label="@string/MotorListTitle" />
-        <activity android:name=".android.motor.MotorDetails" />
+            android:name=".android.motor.BurnPlotActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".android.thrustcurve.TCQueryActivity"
-            android:label="@string/MotorListTitle" />
-        <activity android:name=".android.simulation.SimulationViewer" />
-        <activity android:name=".android.simulation.GraphicalActivity" />
+            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