From 9a992adc3bf37bd33b8dad7b67a9953a743885d4 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 19 May 2014 21:40:03 +0200
Subject: Fix Actionbar spinner in Light Layout, fixes #3858

---
 main/res/layout/cachelist_spinneritem.xml | 6 +++---
 main/res/values/themes.xml                | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml
index c8a589f..58e070e 100644
--- a/main/res/layout/cachelist_spinneritem.xml
+++ b/main/res/layout/cachelist_spinneritem.xml
@@ -5,18 +5,18 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="?attr/dropdownListPreferredItemHeight"
     android:minHeight="?attr/dropdownListPreferredItemHeight"
-    style="?attr/spinnerDropDownItemStyle"
     android:layout_gravity="left|center_vertical"
+    style="?attr/spinnerDropDownItemStyle"
     >
 
 
     <TextView
         android:id="@android:id/text1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
         tools:text="This is the title"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:layout_width="match_parent"
+        style="?attr/titleTextStyle"
         android:layout_height="wrap_content" />
 
 
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        style="?attr/subtitleTextStyle"
         tools:text="This is the subtitle"
         android:id="@android:id/text2" />
 
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index 0308bbe..7928e80 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -33,6 +33,10 @@
     <!-- Identical to cgeo aside from different parent style -->
     <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 
+        <!-- For some reason we get the non inversed texts here (bug in abc?), explicitly set text styles -->
+        <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item>
+        <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item>
+
 
         <item name="android:buttonStyle">@style/button</item>
         <item name="android:editTextStyle">@style/edittext</item>
-- 
cgit v1.1