X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=res%2Fvalues%2Fstyles.xml;h=784eb77c5c90dc9bb61c20eafefa1ca6267d95a0;hp=069097cea02d50c042ddfa75245071b5dcbca7d1;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=d2ae729dd7050e6fd6645fe7d3df818407f50f31

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 069097c..784eb77 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,18 +1,11 @@
 <resources>
-    
-    <style name="MyActionButtonStyle" parent="Widget.Sherlock.ActionButton">
-        <item name="android:minWidth">28dip</item>
-        <!-- 
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:paddingRight">0dip</item>
-         -->
-    </style>
 
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
-    <style name="AppBaseThemeLight" parent="Theme.Sherlock.Light">
+    <style name="AppBaseThemeLight" parent="@style/Theme.AppCompat.Light">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -25,11 +18,11 @@
         <!--
       <item name="searchViewSearchIcon">@android:color/transparent</item>
       <item name="searchViewCloseIcon">@android:color/transparent</item>
-      -->
-      <item name="actionButtonStyle">@style/MyActionButtonStyle</item>
+        -->
     </style>
-    
-    <style name="AppBaseThemeDark" parent="Theme.Sherlock">
+
+    <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -39,18 +32,18 @@
             Make search icon magnifying glass disappear:
             http://stackoverflow.com/questions/13604506/show-actionbarsherlock-searchview-always-expanded
         -->
-      <!--
+        <!--
       <item name="searchViewSearchIcon">@android:color/transparent</item>
       <item name="searchViewCloseIcon">@android:color/transparent</item>
-      -->
-        <item name="actionButtonStyle">@style/MyActionButtonStyle</item>
+        -->
     </style>
 
     <!-- Dark theme -->
 
-    <style name="Theme.Default" parent="AppBaseThemeDark"></style>
+    <style name="Theme.Default" parent="AppBaseThemeDark" />
 
     <style name="Theme.Default.TokenRow.Fg" parent="Theme.Default">
+
         <!-- <item name="android:textColor">#FFFFFF</item> -->
         <item name="android:textColorLink">#00AAFF</item>
     </style>
@@ -58,15 +51,17 @@
     <color name="theme_default_token_row_fg">#FFFFFF</color>
     <color name="theme_default_token_row_main_bg">#222222</color>
     <color name="theme_default_token_row_other_bg">#222222</color>
-    <color name="theme_default_other_lang_bg">#000000</color>
+    <color name="theme_default_normal_row_bg">#000000</color>
 
     <!-- ****************************************************************** -->
 
+
     <!-- Light theme -->
 
-    <style name="Theme.Light" parent="AppBaseThemeLight"></style>
+    <style name="Theme.Light" parent="AppBaseThemeLight" />
 
     <style name="Theme.Light.TokenRow.Fg" parent="Theme.Light">
+
         <!-- <item name="android:textColor">#000000</item> -->
         <item name="android:textColorLink">#0000FF</item>
     </style>
@@ -74,14 +69,6 @@
     <color name="theme_light_token_row_fg">#000000</color>
     <color name="theme_light_token_row_main_bg">#EEEEEE</color>
     <color name="theme_light_token_row_other_bg">#EEEEEE</color>
-    <color name="theme_light_other_lang_bg">#FFFFFF</color>
-
+    <color name="theme_light_normal_row_bg">#FFFFFF</color>
     <color name="gray">#777777</color>
-    
-    <style name="BorderlessButton">
-        <item name="android:background">@null</item>
-        <item name="android:paddingLeft">4dip</item>
-        <item name="android:paddingRight">4dip</item>
-    </style>
-
-</resources>
\ No newline at end of file
+</resources>