diff options
| author | Yuli Huang <yuli@google.com> | 2011-11-08 18:49:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-08 18:49:14 +0000 |
| commit | 9f0dade0d6e29c437c7da65a3d5f3b24dd44d9b9 (patch) | |
| tree | 52bf84b92d2e3d7628261c4721da4736ca791257 /res | |
| parent | 43e4cc3c62e2aae44952bc236d9ae723526ec081 (diff) | |
| parent | 95f64c1b98a3c223ff4b4fe14129de675a306450 (diff) | |
| download | android_packages_apps_Snap-9f0dade0d6e29c437c7da65a3d5f3b24dd44d9b9.tar.gz android_packages_apps_Snap-9f0dade0d6e29c437c7da65a3d5f3b24dd44d9b9.tar.bz2 android_packages_apps_Snap-9f0dade0d6e29c437c7da65a3d5f3b24dd44d9b9.zip | |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
* commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/photoeditor_effect_facetan.png | bin | 0 -> 2868 bytes | |||
| -rw-r--r-- | res/layout/photoeditor_effects_fix.xml | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/res/drawable/photoeditor_effect_facetan.png b/res/drawable/photoeditor_effect_facetan.png Binary files differnew file mode 100644 index 000000000..673a982f6 --- /dev/null +++ b/res/drawable/photoeditor_effect_facetan.png diff --git a/res/layout/photoeditor_effects_fix.xml b/res/layout/photoeditor_effects_fix.xml index b8ed52477..9a2843c67 100644 --- a/res/layout/photoeditor_effects_fix.xml +++ b/res/layout/photoeditor_effects_fix.xml @@ -50,6 +50,16 @@ android:text="@string/facelift" style="@style/EffectLabel"/> </com.android.gallery3d.photoeditor.actions.FaceliftAction> + <com.android.gallery3d.photoeditor.actions.FaceTanAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_facetan"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/facetan" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.FaceTanAction> <com.android.gallery3d.photoeditor.actions.StraightenAction style="@style/Effect" android:tag="@string/straighten_tooltip"> <ImageButton |
