From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 14 Mar 2012 01:29:43 +0000 (+0000)
Subject: Have the star field visible under the actionbar in ICS and Honeycomb devices.
X-Git-Tag: upstream/12.03~1^2~15
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5b8c29021591b312cc51dca99b17e925e1bfcaae;p=debian%2Fopenrocket

Have the star field visible under the actionbar in ICS and Honeycomb devices.

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

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c0d28a01..06114941 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,7 +19,8 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".android.Main">
+            android:name=".android.Main"
+            android:theme="@style/AppTheme.Clean" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,14 +28,15 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".android.rocket.OpenRocketLoaderActivity">
+            android:name=".android.rocket.OpenRocketLoaderActivity"
+            android:theme="@style/AppTheme.Clean" >
 
             <!--
                  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>
diff --git a/android/res/values/actionbar_colors.xml b/android/res/values/actionbar_colors.xml
index 57488174..8939b91f 100644
--- a/android/res/values/actionbar_colors.xml
+++ b/android/res/values/actionbar_colors.xml
@@ -3,6 +3,6 @@
 <resources>
 
     <color name="actionbar_title_color">#FFFFFF</color>
-    <color name="actionbar_background_color">#ff000000</color>
+    <color name="actionbar_background_color">#00000000</color>
     
 </resources>
diff --git a/android/res/values/actionbar_styles.xml b/android/res/values/actionbar_styles.xml
index 3de9965b..b09b7169 100644
--- a/android/res/values/actionbar_styles.xml
+++ b/android/res/values/actionbar_styles.xml
@@ -11,11 +11,15 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
+  limitations under the License.

+-->
 
 <resources>
 
+    <style name="AppTheme.Clean" parent="AppTheme">
+        <item name="android:windowActionBarOverlay">true</item>
+    </style>
+
     <style name="AppTheme" parent="android:style/Theme">
         <item name="android:windowTitleSize">@dimen/actionbar_compat_height</item>
         <item name="android:windowTitleBackgroundStyle">@style/ActionBarCompat</item>
@@ -36,8 +40,9 @@
     <style name="ActionBarCompatHomeAsUp">
         <item name="android:background">@drawable/ic_home_carat</item>
     </style>
-    
+
     <style name="ActionBarCompatItemBase">
+
         <!-- layout_width/height must be set in code -->
         <item name="android:scaleType">center</item>
         <item name="android:background">@drawable/actionbar_compat_item</item>
@@ -62,10 +67,8 @@
         <item name="android:textColor">@color/actionbar_title_color</item>
     </style>
 
-    <style name="ActionBarCompatItem" parent="style/ActionBarCompatItemBase">
-    </style>
+    <style name="ActionBarCompatItem" parent="style/ActionBarCompatItemBase"></style>
 
-    <style name="ActionBarCompatHomeItem" parent="style/ActionBarCompatItemBase">
-    </style>
+    <style name="ActionBarCompatHomeItem" parent="style/ActionBarCompatItemBase"></style>
 
-</resources>
+</resources>
\ No newline at end of file