summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-10-02 00:55:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-10-02 00:55:27 +0000
commit8f438e4ccd19da343c37593ec61ba1887a7c304e (patch)
tree67665b6d406cef27d5874d878b52e20c9a0d2316
parentded96310cfd24b3cea21a814edf8629f592c7014 (diff)
parentd3cf7420ee5a12dbece74e730a4072a067d33dff (diff)
Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev
-rw-r--r--core/res/res/values/themes_material.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index b51974ec20dc..1864f8962700 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -781,9 +781,6 @@ please see themes_device_defaults.xml.
<item name="textCheckMark">@drawable/indicator_check_mark_light</item>
<item name="textCheckMarkInverse">@drawable/indicator_check_mark_dark</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item>
-
<item name="colorControlNormal">?attr/textColorSecondary</item>
<item name="colorControlHighlight">@color/ripple_material_light</item>
<item name="colorButtonNormal">@color/btn_default_material_light</item>
@@ -819,9 +816,6 @@ please see themes_device_defaults.xml.
<item name="textCheckMark">@drawable/indicator_check_mark_dark</item>
<item name="textCheckMarkInverse">@drawable/indicator_check_mark_light</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item>
-
<item name="colorControlNormal">?attr/textColorSecondary</item>
<item name="colorControlHighlight">@color/ripple_material_dark</item>
<item name="colorButtonNormal">@color/btn_default_material_dark</item>