summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-12 14:02:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-12 14:02:28 -0700
commit8ee8811cf7d14d6d92d6dc34b6811c8cfa251083 (patch)
tree85b1465356dce52a7378b0bec5c0dd451365e9ce /res
parent079a21c927b3d10284658e4f4fb93ab71eb727f3 (diff)
parent92bf8707f67fe2a07fe2f8d0bcd48c975637af1e (diff)
downloadandroid_packages_apps_Snap-8ee8811cf7d14d6d92d6dc34b6811c8cfa251083.tar.gz
android_packages_apps_Snap-8ee8811cf7d14d6d92d6dc34b6811c8cfa251083.tar.bz2
android_packages_apps_Snap-8ee8811cf7d14d6d92d6dc34b6811c8cfa251083.zip
Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_activity.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index fb1491963..e8a988ff1 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -115,13 +115,11 @@
android:layout_height="wrap_content"
android:visibility="gone" />
- <!--
<com.android.gallery3d.filtershow.imageshow.ImageCrop
android:id="@+id/imageCrop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
- -->
<com.android.gallery3d.filtershow.imageshow.ImageRotate
android:id="@+id/imageRotate"