diff options
| author | John Hoford <hoford@google.com> | 2013-02-28 01:43:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-28 01:43:44 +0000 |
| commit | 680d30fad60bf7e7ffd9f6fca1e9ac8f36d6f4f0 (patch) | |
| tree | 49df15b70fd09367076d403388b3277eb8c02b54 /res | |
| parent | ac4e910c72e99d3b11e50b0174c89113ca981b6b (diff) | |
| parent | 54b3d67486c05343471e520cdc8d9b882cb0483f (diff) | |
| download | android_packages_apps_Snap-680d30fad60bf7e7ffd9f6fca1e9ac8f36d6f4f0.tar.gz android_packages_apps_Snap-680d30fad60bf7e7ffd9f6fca1e9ac8f36d6f4f0.tar.bz2 android_packages_apps_Snap-680d30fad60bf7e7ffd9f6fca1e9ac8f36d6f4f0.zip | |
Merge "refactor the geometry code" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 55 | ||||
| -rw-r--r-- | res/values/filtershow_ids.xml | 4 |
2 files changed, 5 insertions, 54 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index e811ec742..0f94f9226 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -70,30 +70,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.imageshow.ImageStraighten - android:id="@+id/imageStraighten" - android:layout_width="match_parent" - 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.imageshow.ImageTinyPlanet android:id="@+id/imageTinyPlanet" android:layout_width="match_parent" @@ -203,37 +179,8 @@ android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_gravity="left" - android:orientation="horizontal"> - - <com.android.gallery3d.filtershow.ui.IconButton - android:id="@+id/straightenButton" - android:layout_height="match_parent" - style="@style/IconButton" - android:drawableTop="@drawable/filtershow_button_geometry_straighten" - android:text="@string/straighten" /> - - <com.android.gallery3d.filtershow.ui.IconButton - android:id="@+id/cropButton" - android:layout_height="match_parent" - style="@style/IconButton" - android:drawableTop="@drawable/filtershow_button_geometry_crop" - android:text="@string/crop" /> - - <com.android.gallery3d.filtershow.ui.IconButton - android:id="@+id/rotateButton" - android:layout_height="match_parent" - style="@style/IconButton" - android:drawableTop="@drawable/filtershow_button_geometry_rotate" - android:text="@string/rotate" /> - - <com.android.gallery3d.filtershow.ui.IconButton - android:id="@+id/flipButton" - android:layout_height="match_parent" - style="@style/IconButton" - android:drawableTop="@drawable/filtershow_button_geometry_flip" - android:text="@string/mirror" /> + android:orientation="horizontal" /> - </LinearLayout> </HorizontalScrollView> <HorizontalScrollView diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index 28e78166d..9380740ce 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -42,4 +42,8 @@ <item type="id" name="editorRedEye" /> <item type="id" name="imageOnlyEditor" /> <item type="id" name="vignetteEditor" /> + <item type="id" name="editorCrop" /> + <item type="id" name="editorFlip" /> + <item type="id" name="editorRotate" /> + <item type="id" name="editorStraighten" /> </resources> |