summaryrefslogtreecommitdiffstats
path: root/res/layout/multigrid_content.xml
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-10-17 23:40:33 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-17 23:40:33 -0700
commitbcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 (patch)
tree85d07b2095695fe79235ab16e627f8b22c7bfd8d /res/layout/multigrid_content.xml
parenta3fcd50080c0546ebd5f0caf932eef02fabdd7ad (diff)
parent8de528917bf03cca93ac2a3dd19b7a5719d1a26e (diff)
downloadandroid_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.gz
android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.bz2
android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.zip
Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0
Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2
Diffstat (limited to 'res/layout/multigrid_content.xml')
-rw-r--r--res/layout/multigrid_content.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml
index b1cb145a2..618af4898 100644
--- a/res/layout/multigrid_content.xml
+++ b/res/layout/multigrid_content.xml
@@ -36,7 +36,7 @@
</LinearLayout>
- <FrameLayout android:id="@+id/gridContainer"
+ <HorizontalScrollView android:id="@+id/gridContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -52,6 +52,6 @@
android:layout_height="match_parent"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" />
- </FrameLayout>
+ </HorizontalScrollView>
-</FrameLayout> \ No newline at end of file
+</FrameLayout>