summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-08-14 21:25:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-14 21:25:18 +0000
commita044ee9746c40ec003ba5a96bea91abd7cee2bb5 (patch)
tree91ccc8465bffa297ac2d1910ac504029179ede70 /res
parent9530962f09e4ef5cefd81cb3cbc5cff2a6e5b818 (diff)
parent58e2f6effa634e853d521f57d284c248adc69057 (diff)
downloadandroid_packages_apps_Gallery2-a044ee9746c40ec003ba5a96bea91abd7cee2bb5.tar.gz
android_packages_apps_Gallery2-a044ee9746c40ec003ba5a96bea91abd7cee2bb5.tar.bz2
android_packages_apps_Gallery2-a044ee9746c40ec003ba5a96bea91abd7cee2bb5.zip
Merge "fix RGB text" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/filtershow_editor_panel.xml3
-rw-r--r--res/layout/filtershow_seekbar.xml3
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index fc3246826..cafafde1b 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -117,7 +117,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- style="@style/FilterShowSlider"/>
+ style="@style/FilterShowSlider"
+ android:visibility="gone"/>
</LinearLayout>
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 6463ca8e1..54a874d07 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -26,6 +26,7 @@
android:id="@+id/primarySeekBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/FilterShowSlider" />
+ style="@style/FilterShowSlider"
+ android:visibility="gone" />
</LinearLayout>