summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2011-05-17 10:07:23 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-17 10:07:23 -0700
commitf95e474796aa03e2367fe9134e561282c7a05619 (patch)
tree1c505689de0b6f647d530c4d99fd456b7853c5d6
parent92f51e247d4299bd8e79d8799dc972b3a24ebcae (diff)
parentb45b21d13e3311c819d5fbd548ff8c859cc1dfe3 (diff)
am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3': Turn fading edges back on for ScrollView and HorizontalScrollView.
-rw-r--r--core/res/res/values/styles.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 2d44f62ba08f..ed1fec3d5be1 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -574,12 +574,12 @@
<style name="Widget.ScrollView">
<item name="android:scrollbars">vertical</item>
- <item name="android:fadingEdge">none</item>
+ <item name="android:fadingEdge">vertical</item>
</style>
<style name="Widget.HorizontalScrollView">
<item name="android:scrollbars">horizontal</item>
- <item name="android:fadingEdge">none</item>
+ <item name="android:fadingEdge">horizontal</item>
</style>
<style name="Widget.ListView" parent="Widget.AbsListView">