diff options
| author | John Hoford <hoford@google.com> | 2013-01-08 14:20:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-08 14:20:59 -0800 |
| commit | 4c7aa9fe20d1035fc10334a6feb2bc5bd97c28b7 (patch) | |
| tree | 710cd2a16343f96b64100872e1fed675f2a2445b /res | |
| parent | fd775153d472ea9952a6d648bde88324c3428cc9 (diff) | |
| parent | 155549cc1255bc43a677c2e2f5bde9ac3aaab2ba (diff) | |
| download | android_packages_apps_Snap-4c7aa9fe20d1035fc10334a6feb2bc5bd97c28b7.tar.gz android_packages_apps_Snap-4c7aa9fe20d1035fc10334a6feb2bc5bd97c28b7.tar.bz2 android_packages_apps_Snap-4c7aa9fe20d1035fc10334a6feb2bc5bd97c28b7.zip | |
Merge "Add a Draw filter" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 5 | ||||
| -rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index ed562f9d4..dfd669f98 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -118,6 +118,11 @@ android:layout_height="wrap_content" android:visibility="gone" /> + <com.android.gallery3d.filtershow.imageshow.ImageDraw + android:id="@+id/imageDraw" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> <!-- <ImageButton android:id="@+id/showOriginalButton" diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index 2a2a795b0..0a9468951 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -34,4 +34,5 @@ <item type="id" name="edgeButton" /> <item type="id" name="kmeansButton" /> <item type="id" name="downsampleButton" /> + <item type="id" name="drawOnImageButton" /> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index d86535691..7f96824be 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -123,6 +123,8 @@ <string name="vignette">Vignette</string> <!-- Label for the image effect that removes redeye. [CHAR LIMIT=10] --> <string name="redeye">Red Eye</string> + <!-- Label for the that allows drawing on Image [CHAR LIMIT=10] --> + <string name="imageDraw">Draw</string> <!-- Label for the image straighten effect [CHAR LIMIT=15] --> <string name="straighten" msgid="5217801513491493491">Straighten</string> <!-- Label for the image crop effect [CHAR LIMIT=15] --> |