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

diff --git a/res/values/styles.xml b/res/values/styles.xml
index bce60d9..784eb77 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,19 +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
@@ -27,10 +19,10 @@
       <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
@@ -44,12 +36,11 @@
       <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">
 
@@ -67,7 +58,7 @@
 
     <!-- Light theme -->
 
-    <style name="Theme.Light" parent="AppBaseThemeLight"></style>
+    <style name="Theme.Light" parent="AppBaseThemeLight" />
 
     <style name="Theme.Light.TokenRow.Fg" parent="Theme.Light">
 
@@ -80,11 +71,4 @@
     <color name="theme_light_token_row_other_bg">#EEEEEE</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>