summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2015-11-30 10:56:59 -0800
committerJustin Klaassen <justinklaassen@google.com>2016-02-16 15:58:58 -0800
commitefd519b656e46159c78d0458caeb141c6acba264 (patch)
tree86b0555a8de78eefedab946c086ac72dca7476fb /res
parente897996083fe8ab520dce375e90ba58f5dadec5d (diff)
downloadandroid_packages_apps_DeskClock-efd519b656e46159c78d0458caeb141c6acba264.tar.gz
android_packages_apps_DeskClock-efd519b656e46159c78d0458caeb141c6acba264.tar.bz2
android_packages_apps_DeskClock-efd519b656e46159c78d0458caeb141c6acba264.zip
Use AppCompat's imageButtonStyle attribute - DO NOT MERGE
Bug: 25896454 Change-Id: I17b82001b1e0da7b7c642f95e96e406d58a77e00 (cherry picked from commit aacfcd67c7236a766a75325017e68f19c3b2ce19)
Diffstat (limited to 'res')
-rw-r--r--res/values/styles.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ce89f1175..d2ccdf63c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,10 +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>
@@ -111,7 +111,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>