From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 26 Feb 2012 00:27:14 +0000 (+0000)
Subject: Failed to commit the AndroidManifest.xml when I changed the main and openrocketloader... 
X-Git-Tag: upstream/12.03~1^2~27
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=16b9b40e7fbe106a4b586369a1d9e274639be529;p=debian%2Fopenrocket

Failed to commit the AndroidManifest.xml when I changed the main and openrocketloader classes to use ActionBarFragmentActivity.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@444 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 5d8e6376..c0d28a01 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,8 +19,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".android.Main"
-            android:theme="@style/AppTheme.NoTitleBar" >
+            android:name=".android.Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,8 +27,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".android.rocket.OpenRocketLoaderActivity"
-            android:theme="@style/AppTheme.NoTitleBar" >
+            android:name=".android.rocket.OpenRocketLoaderActivity">
 
             <!--
                  I don't understand why I need to have two different intent filters.