Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / res / values-v11 / styles.xml

diff --git a/android/res/values-v11/styles.xml b/android/res/values-v11/styles.xml
index 1da23b82fd8e706e256c7dc1968af8bfd29fd28c..535b5345acd25849485db08fbed1d1f6798a1499 100644 (file)
--- a/android/res/values-v11/styles.xml
+++ b/android/res/values-v11/styles.xml
@@ -1,39 +1,22 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  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.
--->
-
 <resources>
 
-    <style name="AppTheme" parent="android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/ActionBar</item>
-        <item name="android:windowContentOverlay">@drawable/actionbar_shadow</item>
-    </style>
-
-    <style name="ActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:background">@color/actionbar_background_color</item>
-        <item name="android:titleTextStyle">@style/ActionBarTitle</item>
-        <item name="android:logo">@drawable/home_item</item>
+    <style name="spinnerStyle" parent="Widget.Sherlock.TextView.SpinnerItem">
+        <item name="android:textSize">22dp</item>
     </style>
 
-    <style name="ActionBarTitle">
-        <item name="android:textColor">@color/actionbar_title_color</item>
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="android:actionBarStyle">@style/ActionBar.noBlueBar</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
     </style>
 
-    <style name="spinnerStyle" parent="@android:style/Widget.Holo.TextView.SpinnerItem">
-        <item name="android:textSize">22dp</item>
-        <item name="android:layout_height">wrap_content</item>
+    <style name="ActionBar.noBlueBar" parent="Widget.Sherlock.ActionBar">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+        <item name="android:displayOptions"></item>
+        <item name="displayOptions"></item>
     </style>
 
 </resources>
\ No newline at end of file