Merge branch 'master' of gitorious.org:owncloud/android-devel

[pub/Android/ownCloud.git] / res / values / styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1f6874b..8d5491f 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -3,17 +3,27 @@
        <style name="Animations" />
 
        <!-- Default ownCloud app style -->
        <style name="Animations" />
 
        <!-- Default ownCloud app style -->

-       <style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light">
-       <item name="abBackground">@drawable/main_header_bg</item>
-       <item name="abTitleTextStyle">@style/ocActionBarTextStyle</item>
+       <style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
+       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>

        </style>
        </style>

+       
+       <style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
+      <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+      <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+  </style>
+       

 
 

-       <style name="ocActionBarTextStyle">
+       <style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
+       <item name="android:background">@drawable/main_header_bg</item>
+       <item name="background">@drawable/main_header_bg</item>

        <item name="android:textColor">#ffffff</item>
        <item name="android:textColor">#ffffff</item>

+       <item name="android:shadowColor">#222222</item>
+       <item name="android:shadowRadius">1</item>
+       <item name="android:shadowDy">1</item>
+       <item name="android:backgroundSplit">@drawable/split_action_bg</item>

        </style>
        
        </style>
        

-       
-       

        <!-- PopDownMenu -->
        <style name="Animations.PopDownMenu" />
        
        <!-- PopDownMenu -->
        <style name="Animations.PopDownMenu" />