From 2c1b67e14329f4d9c046253410012107e9d65f28 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Tue, 29 Oct 2013 10:33:30 +0100
Subject: [PATCH] OC-1832: Customize dropdown and spinner in ActionBar

---
 ...t_dropdown_default.9.png => dropdown_default.9.png} | Bin
 ...dropdown_disabled.9.png => dropdown_disabled.9.png} | Bin
 ...t_dropdown_focused.9.png => dropdown_focused.9.png} | Bin
 ...t_dropdown_pressed.9.png => dropdown_pressed.9.png} | Bin
 ...eenet_spinner_48_inner.png => spinner_48_inner.png} | Bin
 ...t_dropdown_default.9.png => dropdown_default.9.png} | Bin
 ...dropdown_disabled.9.png => dropdown_disabled.9.png} | Bin
 ...t_dropdown_focused.9.png => dropdown_focused.9.png} | Bin
 ...t_dropdown_pressed.9.png => dropdown_pressed.9.png} | Bin
 ...eenet_spinner_48_inner.png => spinner_48_inner.png} | Bin
 ...t_dropdown_default.9.png => dropdown_default.9.png} | Bin
 ...dropdown_disabled.9.png => dropdown_disabled.9.png} | Bin
 ...t_dropdown_focused.9.png => dropdown_focused.9.png} | Bin
 ...t_dropdown_pressed.9.png => dropdown_pressed.9.png} | Bin
 ...eenet_spinner_48_inner.png => spinner_48_inner.png} | Bin
 res/drawable/{freenet_dropdown.xml => dropdown.xml}    |   8 ++++----
 ...rminate_progress.xml => indeterminate_progress.xml} |   2 +-
 res/values/styles.xml                                  |  17 ++++++++++++++++-
 18 files changed, 21 insertions(+), 6 deletions(-)
 rename res/drawable-hdpi/{freenet_dropdown_default.9.png => dropdown_default.9.png} (100%)
 rename res/drawable-hdpi/{freenet_dropdown_disabled.9.png => dropdown_disabled.9.png} (100%)
 rename res/drawable-hdpi/{freenet_dropdown_focused.9.png => dropdown_focused.9.png} (100%)
 rename res/drawable-hdpi/{freenet_dropdown_pressed.9.png => dropdown_pressed.9.png} (100%)
 rename res/drawable-hdpi/{freenet_spinner_48_inner.png => spinner_48_inner.png} (100%)
 rename res/drawable-mdpi/{freenet_dropdown_default.9.png => dropdown_default.9.png} (100%)
 rename res/drawable-mdpi/{freenet_dropdown_disabled.9.png => dropdown_disabled.9.png} (100%)
 rename res/drawable-mdpi/{freenet_dropdown_focused.9.png => dropdown_focused.9.png} (100%)
 rename res/drawable-mdpi/{freenet_dropdown_pressed.9.png => dropdown_pressed.9.png} (100%)
 rename res/drawable-mdpi/{freenet_spinner_48_inner.png => spinner_48_inner.png} (100%)
 rename res/drawable-xhdpi/{freenet_dropdown_default.9.png => dropdown_default.9.png} (100%)
 rename res/drawable-xhdpi/{freenet_dropdown_disabled.9.png => dropdown_disabled.9.png} (100%)
 rename res/drawable-xhdpi/{freenet_dropdown_focused.9.png => dropdown_focused.9.png} (100%)
 rename res/drawable-xhdpi/{freenet_dropdown_pressed.9.png => dropdown_pressed.9.png} (100%)
 rename res/drawable-xhdpi/{freenet_spinner_48_inner.png => spinner_48_inner.png} (100%)
 rename res/drawable/{freenet_dropdown.xml => dropdown.xml} (77%)
 rename res/drawable/{freenet_indeterminate_progress.xml => indeterminate_progress.xml} (94%)

diff --git a/res/drawable-hdpi/freenet_dropdown_default.9.png b/res/drawable-hdpi/dropdown_default.9.png
similarity index 100%
rename from res/drawable-hdpi/freenet_dropdown_default.9.png
rename to res/drawable-hdpi/dropdown_default.9.png
diff --git a/res/drawable-hdpi/freenet_dropdown_disabled.9.png b/res/drawable-hdpi/dropdown_disabled.9.png
similarity index 100%
rename from res/drawable-hdpi/freenet_dropdown_disabled.9.png
rename to res/drawable-hdpi/dropdown_disabled.9.png
diff --git a/res/drawable-hdpi/freenet_dropdown_focused.9.png b/res/drawable-hdpi/dropdown_focused.9.png
similarity index 100%
rename from res/drawable-hdpi/freenet_dropdown_focused.9.png
rename to res/drawable-hdpi/dropdown_focused.9.png
diff --git a/res/drawable-hdpi/freenet_dropdown_pressed.9.png b/res/drawable-hdpi/dropdown_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/freenet_dropdown_pressed.9.png
rename to res/drawable-hdpi/dropdown_pressed.9.png
diff --git a/res/drawable-hdpi/freenet_spinner_48_inner.png b/res/drawable-hdpi/spinner_48_inner.png
similarity index 100%
rename from res/drawable-hdpi/freenet_spinner_48_inner.png
rename to res/drawable-hdpi/spinner_48_inner.png
diff --git a/res/drawable-mdpi/freenet_dropdown_default.9.png b/res/drawable-mdpi/dropdown_default.9.png
similarity index 100%
rename from res/drawable-mdpi/freenet_dropdown_default.9.png
rename to res/drawable-mdpi/dropdown_default.9.png
diff --git a/res/drawable-mdpi/freenet_dropdown_disabled.9.png b/res/drawable-mdpi/dropdown_disabled.9.png
similarity index 100%
rename from res/drawable-mdpi/freenet_dropdown_disabled.9.png
rename to res/drawable-mdpi/dropdown_disabled.9.png
diff --git a/res/drawable-mdpi/freenet_dropdown_focused.9.png b/res/drawable-mdpi/dropdown_focused.9.png
similarity index 100%
rename from res/drawable-mdpi/freenet_dropdown_focused.9.png
rename to res/drawable-mdpi/dropdown_focused.9.png
diff --git a/res/drawable-mdpi/freenet_dropdown_pressed.9.png b/res/drawable-mdpi/dropdown_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/freenet_dropdown_pressed.9.png
rename to res/drawable-mdpi/dropdown_pressed.9.png
diff --git a/res/drawable-mdpi/freenet_spinner_48_inner.png b/res/drawable-mdpi/spinner_48_inner.png
similarity index 100%
rename from res/drawable-mdpi/freenet_spinner_48_inner.png
rename to res/drawable-mdpi/spinner_48_inner.png
diff --git a/res/drawable-xhdpi/freenet_dropdown_default.9.png b/res/drawable-xhdpi/dropdown_default.9.png
similarity index 100%
rename from res/drawable-xhdpi/freenet_dropdown_default.9.png
rename to res/drawable-xhdpi/dropdown_default.9.png
diff --git a/res/drawable-xhdpi/freenet_dropdown_disabled.9.png b/res/drawable-xhdpi/dropdown_disabled.9.png
similarity index 100%
rename from res/drawable-xhdpi/freenet_dropdown_disabled.9.png
rename to res/drawable-xhdpi/dropdown_disabled.9.png
diff --git a/res/drawable-xhdpi/freenet_dropdown_focused.9.png b/res/drawable-xhdpi/dropdown_focused.9.png
similarity index 100%
rename from res/drawable-xhdpi/freenet_dropdown_focused.9.png
rename to res/drawable-xhdpi/dropdown_focused.9.png
diff --git a/res/drawable-xhdpi/freenet_dropdown_pressed.9.png b/res/drawable-xhdpi/dropdown_pressed.9.png
similarity index 100%
rename from res/drawable-xhdpi/freenet_dropdown_pressed.9.png
rename to res/drawable-xhdpi/dropdown_pressed.9.png
diff --git a/res/drawable-xhdpi/freenet_spinner_48_inner.png b/res/drawable-xhdpi/spinner_48_inner.png
similarity index 100%
rename from res/drawable-xhdpi/freenet_spinner_48_inner.png
rename to res/drawable-xhdpi/spinner_48_inner.png
diff --git a/res/drawable/freenet_dropdown.xml b/res/drawable/dropdown.xml
similarity index 77%
rename from res/drawable/freenet_dropdown.xml
rename to res/drawable/dropdown.xml
index d3d1ac8d..13e06b97 100644
--- a/res/drawable/freenet_dropdown.xml
+++ b/res/drawable/dropdown.xml
@@ -19,10 +19,10 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
-          android:drawable="@drawable/freenet_dropdown_disabled" />
+          android:drawable="@drawable/dropdown_disabled" />
     <item android:state_pressed="true"
-          android:drawable="@drawable/freenet_dropdown_pressed" />
+          android:drawable="@drawable/dropdown_pressed" />
     <item android:state_pressed="false" android:state_focused="true"
-          android:drawable="@drawable/freenet_dropdown_focused" />
-    <item android:drawable="@drawable/freenet_dropdown_default" />
+          android:drawable="@drawable/dropdown_focused" />
+    <item android:drawable="@drawable/dropdown_default" />
 </selector>
diff --git a/res/drawable/freenet_indeterminate_progress.xml b/res/drawable/indeterminate_progress.xml
similarity index 94%
rename from res/drawable/freenet_indeterminate_progress.xml
rename to res/drawable/indeterminate_progress.xml
index ae1c2e48..4f19fdde 100644
--- a/res/drawable/freenet_indeterminate_progress.xml
+++ b/res/drawable/indeterminate_progress.xml
@@ -27,7 +27,7 @@
     </item-->
     <item>
         <rotate
-             android:drawable="@drawable/freenet_spinner_48_inner"
+             android:drawable="@drawable/spinner_48_inner"
              android:pivotX="50%"
              android:pivotY="50%"
              android:fromDegrees="0"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 00e96b46..b2ecee3a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,18 +25,24 @@
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+    	<item name="actionDropDownStyle">@style/DropDownStyle</item>
+    	<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
 	</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>
       <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+      <item name="actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
     </style>
 	
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="android:windowFullscreen">true</item>
+      <item name="actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
     </style>
 	
 	
@@ -48,9 +54,18 @@
     	<item name="android:shadowRadius">1</item>
     	<item name="android:shadowDy">1</item>
     	<item name="android:backgroundSplit">@drawable/split_action_bg</item>
+    	<item name="android:indeterminateProgressStyle">@style/IndeterminateStyle</item>
+    	<item name="indeterminateProgressStyle">@style/IndeterminateStyle</item>
+	</style>
+
+	<!-- DropDown -->
+	<style name="DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+	    <item name="android:background">@drawable/dropdown</item>
+	</style>
+	<style name="IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
+	    <item name="android:indeterminateDrawable">@drawable/indeterminate_progress</item>
 	</style>
 
-		
 	<!-- Dialogs -->
 	<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
 	</style>
-- 
2.11.0