Change to using ActionBarSherlock for the action bar compatibility.

[debian/openrocket] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 511447eddb6910c967b2f4d912797d35becdaf6e..d39d7a27059bf6331c92b61c330cff7b0af2414c 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -5,37 +5,40 @@
     android:versionName="1.0" >\r
 \r
     <uses-sdk\r
-        android:minSdkVersion="8"\r
-        android:targetSdkVersion="8" />\r
+        android:minSdkVersion="9"\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: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
+            android:name=".android.rocket.OpenRocketLoaderActivity"\r
+            android:theme="@style/AppTheme.NoActionBar" >\r
 \r
             <!--\r
-            I don't understand why I need to have two different intent filters.  Combining the <data> elements\r
-            into a single field did not result in a working application.\r
-            The first intent-filter (with mimeType wildcard) convinces the file browser to associate the correct launcher\r
-            icon.\r
-            the second intent-filter is actually invoked when a file is selected.\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
-            <intent-filter >\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
@@ -46,7 +49,8 @@
                     android:pathPattern=".*\\.ork"\r
                     android:scheme="file" />\r
             </intent-filter>\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
@@ -57,23 +61,23 @@
                     android:scheme="file" />\r
             </intent-filter>\r
         </activity>\r
+        <activity android:name=".android.rocket.OpenRocketViewer" />\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 android:name=".android.thrustcurve.TCQueryActivity" />\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.simulation.SimulationViewActivity"\r
+            android:theme="@style/AppTheme.NoActionBar" />\r
+        <activity android:name=".android.filebrowser.SimpleFileBrowser" />\r
     </application>\r
 \r
 </manifest>
\ No newline at end of file