summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-03-03 11:54:49 -0800
committerAlan Newberger <alann@google.com>2015-03-04 12:40:26 -0800
commit19b1df0b8013a585f78d10006b862d160ef28b83 (patch)
tree717a5470dba657304b37a36aa8b5817082ea8e16 /res
parente727428fb48a0df77a42eca417dec8749397d407 (diff)
downloadandroid_packages_apps_Camera2-19b1df0b8013a585f78d10006b862d160ef28b83.tar.gz
android_packages_apps_Camera2-19b1df0b8013a585f78d10006b862d160ef28b83.tar.bz2
android_packages_apps_Camera2-19b1df0b8013a585f78d10006b862d160ef28b83.zip
Enable ripple for filmstrip buttons
Style already specified selectableItemBackgroundBorderless, but no ripple was visible. Swapped in an explicit ripple drawable, works fine. Bug: 19586511 Change-Id: I154e5b30705cb2f07b4c6824869abc05a745335e
Diffstat (limited to 'res')
-rw-r--r--res/drawable-v21/filmstrip_button_background.xml4
-rw-r--r--res/values-v21/styles.xml3
2 files changed, 6 insertions, 1 deletions
diff --git a/res/drawable-v21/filmstrip_button_background.xml b/res/drawable-v21/filmstrip_button_background.xml
new file mode 100644
index 000000000..0b5823546
--- /dev/null
+++ b/res/drawable-v21/filmstrip_button_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- color to match system drawable ripple_material_dark -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="#40ffffff" />
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 20b3b0410..7e6a6906a 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -47,10 +47,11 @@
<style name="FilmstripBottomControlButton">
<item name="android:layout_width">@dimen/filmstrip_bottom_control_button_size</item>
<item name="android:layout_height">@dimen/filmstrip_bottom_control_button_size</item>
- <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+ <item name="android:background">@drawable/filmstrip_button_background</item>
<item name="android:scaleType">centerInside</item>
<item name="android:layout_gravity">center_vertical</item>
</style>
+
<style name="DialogCheckBox">
<item name="android:textColor">@color/dialog_text_color</item>
<item name="android:buttonTint">@color/dialog_text_color</item>