summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2012-10-11 00:25:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 00:25:18 -0700
commit73c60ceed9a8df0907cee52d804100f65771f3b6 (patch)
tree3c5fec1c8f6f006b3abc2bea8489153fe17e3d1b
parent7761357f4a55de6745ac5172355d1a09a9a37492 (diff)
parent91e5e893c1728f887ea461523f1d8960417a4a55 (diff)
downloadandroid_packages_apps_Gallery2-73c60ceed9a8df0907cee52d804100f65771f3b6.tar.gz
android_packages_apps_Gallery2-73c60ceed9a8df0907cee52d804100f65771f3b6.tar.bz2
android_packages_apps_Gallery2-73c60ceed9a8df0907cee52d804100f65771f3b6.zip
Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
-rw-r--r--res/layout/filtershow_activity.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 6f1b1901e..1920b64d6 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"