瀏覽代碼

OC-1832: Customize dropdown and spinner in ActionBar

masensio 11 年之前
父節點
當前提交
2c1b67e143

+ 0 - 0
res/drawable-hdpi/freenet_dropdown_default.9.png → res/drawable-hdpi/dropdown_default.9.png


+ 0 - 0
res/drawable-hdpi/freenet_dropdown_disabled.9.png → res/drawable-hdpi/dropdown_disabled.9.png


+ 0 - 0
res/drawable-hdpi/freenet_dropdown_focused.9.png → res/drawable-hdpi/dropdown_focused.9.png


+ 0 - 0
res/drawable-hdpi/freenet_dropdown_pressed.9.png → res/drawable-hdpi/dropdown_pressed.9.png


+ 0 - 0
res/drawable-hdpi/freenet_spinner_48_inner.png → res/drawable-hdpi/spinner_48_inner.png


+ 0 - 0
res/drawable-mdpi/freenet_dropdown_default.9.png → res/drawable-mdpi/dropdown_default.9.png


+ 0 - 0
res/drawable-mdpi/freenet_dropdown_disabled.9.png → res/drawable-mdpi/dropdown_disabled.9.png


+ 0 - 0
res/drawable-mdpi/freenet_dropdown_focused.9.png → res/drawable-mdpi/dropdown_focused.9.png


+ 0 - 0
res/drawable-mdpi/freenet_dropdown_pressed.9.png → res/drawable-mdpi/dropdown_pressed.9.png


+ 0 - 0
res/drawable-mdpi/freenet_spinner_48_inner.png → res/drawable-mdpi/spinner_48_inner.png


+ 0 - 0
res/drawable-xhdpi/freenet_dropdown_default.9.png → res/drawable-xhdpi/dropdown_default.9.png


+ 0 - 0
res/drawable-xhdpi/freenet_dropdown_disabled.9.png → res/drawable-xhdpi/dropdown_disabled.9.png


+ 0 - 0
res/drawable-xhdpi/freenet_dropdown_focused.9.png → res/drawable-xhdpi/dropdown_focused.9.png


+ 0 - 0
res/drawable-xhdpi/freenet_dropdown_pressed.9.png → res/drawable-xhdpi/dropdown_pressed.9.png


+ 0 - 0
res/drawable-xhdpi/freenet_spinner_48_inner.png → res/drawable-xhdpi/spinner_48_inner.png


+ 4 - 4
res/drawable/freenet_dropdown.xml → 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>

+ 1 - 1
res/drawable/freenet_indeterminate_progress.xml → 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"

+ 16 - 1
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>