commit 20a8e3cfd42c633f7054ef376396916300ea9071
author Bart Sears <bsears@google.com> Thu Oct 11 00:26:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 11 00:26:10 2012 -0700
tree c555dc7f1de5f26a98e09b6ec854ffd675a7de91
parent d223b7f02fcfe520d3f53eaec97f6cd08bd09296
parent 67ca0a789b0f9765990f90f4ff030ae08e44ac17

am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches

* commit '73c60ceed9a8df0907cee52d804100f65771f3b6':
  Hide unwanted scrollbars in editor

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 6f1b190..1920b64 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -211,7 +211,8 @@
             <HorizontalScrollView
                 android:id="@+id/fxList"
                 android:layout_width="match_parent"
-                android:layout_height="96dip">
+                android:layout_height="96dip"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listFilters"
@@ -225,7 +226,8 @@
                 android:id="@+id/bordersList"
                 android:layout_width="match_parent"
                 android:layout_height="96dip"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listBorders"
@@ -240,7 +242,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
                 android:background="@color/background_main_toolbar"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listGeometry"
@@ -287,7 +290,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
                 android:background="@color/background_main_toolbar"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listColorsFx"