diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-08 13:17:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 13:17:19 -0700 |
| commit | 25a9ae276acdde21c5f647a170cc19f04be8e62e (patch) | |
| tree | e88787f7be0a6ab47fe6d65f6f6f31fdb59f04d6 /res | |
| parent | 4b6150f4242f1850d83a08b6662f5da3a35b26f8 (diff) | |
| parent | 16f709d45ab563cb53d28fce7efb1afda60f01ab (diff) | |
| download | android_packages_apps_Snap-25a9ae276acdde21c5f647a170cc19f04be8e62e.tar.gz android_packages_apps_Snap-25a9ae276acdde21c5f647a170cc19f04be8e62e.tar.bz2 android_packages_apps_Snap-25a9ae276acdde21c5f647a170cc19f04be8e62e.zip | |
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 3cf0c822a..a3e402371 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -114,6 +114,24 @@ 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" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + + <com.android.gallery3d.filtershow.imageshow.ImageFlip + android:id="@+id/imageFlip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + <com.android.gallery3d.filtershow.ui.ImageCurves android:id="@+id/imageCurves" android:layout_width="match_parent" @@ -373,4 +391,4 @@ </LinearLayout> </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> |