diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-12 14:04:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 14:04:11 -0700 |
| commit | dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549 (patch) | |
| tree | cfd031154af3a2b12fbaf789d94cfc2bd641f52a | |
| parent | 900bf9b177a5f8faae853b3cbe1ce818d96c6e8a (diff) | |
| parent | 8ee8811cf7d14d6d92d6dc34b6811c8cfa251083 (diff) | |
| download | android_packages_apps_Snap-dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549.tar.gz android_packages_apps_Snap-dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549.tar.bz2 android_packages_apps_Snap-dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549.zip | |
am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
* commit '7776408c5bbd4bb2669b7a577d157dc1967e434e':
Adding crop UI. Fixes a number of other UI bugs.
| -rw-r--r-- | res/layout/filtershow_activity.xml | 2 |
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" |