summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2016-02-19 02:33:22 +0000
committerd34d <clark@cyngn.com>2016-03-14 14:08:27 -0700
commit40c215c663d3d0cc13dff146f06f1ee73714fc43 (patch)
tree2df94d54d70dfb2ae32af11d696bc60606599904
parenta77af8d49317d2de92d389cd2b238531281b9118 (diff)
downloadandroid_packages_apps_DeskClock-40c215c663d3d0cc13dff146f06f1ee73714fc43.tar.gz
android_packages_apps_DeskClock-40c215c663d3d0cc13dff146f06f1ee73714fc43.tar.bz2
android_packages_apps_DeskClock-40c215c663d3d0cc13dff146f06f1ee73714fc43.zip
Use AppCompat\'s imageButtonStyle attribute
am: 3003b28b22 * commit '3003b28b228399c60d2a36647c28eb7a8b6c7ebe': Use AppCompat's imageButtonStyle attribute Change-Id: I718e4e67d2eb560e28c13ae733cfbd93bda88c47
-rw-r--r--res/values/styles.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a5345b06..a300007a9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,9 +23,10 @@
</style>
<style name="BaseActivityTheme" parent="Theme.AppCompat">
- <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
+ <item name="android:windowBackground">@color/default_background</item>
<item name="alertDialogTheme">@style/AlertDialogTheme</item>
+ <item name="imageButtonStyle">@style/ImageButtonStyle</item>
<item name="colorAccent">@color/color_accent</item>
<item name="colorPrimaryDark">@color/status_bar</item>
<item name="colorControlActivated">@color/white</item>
@@ -140,7 +141,7 @@
<style name="ScreensaverActivityTheme" parent="Theme.AppCompat.NoActionBar" />
- <style name="ImageButtonStyle" parent="android:Widget.DeviceDefault.ImageButton">
+ <style name="ImageButtonStyle" parent="Widget.AppCompat.ImageButton">
<item name="android:background">?attr/selectableItemBackgroundBorderless</item>
</style>