summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-24 18:39:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-24 18:39:48 -0700
commitc260dc584e5a24e89f9e6112b94da35d13cda053 (patch)
treec97e4266c01c9720c04bd66c3f615f51695969e4
parent5688dc11c8857921e4da3701a31b2f4d7316a935 (diff)
parentcd7a760369f50ae9424a68fa903351cc54314115 (diff)
downloadandroid_packages_apps_Snap-c260dc584e5a24e89f9e6112b94da35d13cda053.tar.gz
android_packages_apps_Snap-c260dc584e5a24e89f9e6112b94da35d13cda053.tar.bz2
android_packages_apps_Snap-c260dc584e5a24e89f9e6112b94da35d13cda053.zip
am 2c6ea941: Add rotation to tinyplanet view
* commit '2c6ea941a80ea22317d664e329aed51f5f7417b9': Add rotation to tinyplanet view
-rw-r--r--res/layout/filtershow_activity.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index f081b7428..00f0b8f10 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -108,6 +108,11 @@
android:layout_height="wrap_content"
android:visibility="gone" />
+ <com.android.gallery3d.filtershow.imageshow.ImageTinyPlanet
+ android:id="@+id/imageTinyPlanet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
<!--
<ImageButton
android:id="@+id/showOriginalButton"