diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-03-05 00:09:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-05 00:09:29 +0000 |
| commit | f2ce69e2ef6395313d0a361f3849e338a7cf6969 (patch) | |
| tree | 497083cdddbb701d1e8fa66e78fbcaa9524aac6c | |
| parent | e05821303f17cb8f20d2b3eac9cc909bb9e2660d (diff) | |
| parent | ec776b17fc04d329944eaea7bf82d6bb87750d03 (diff) | |
| download | android_packages_apps_Snap-f2ce69e2ef6395313d0a361f3849e338a7cf6969.tar.gz android_packages_apps_Snap-f2ce69e2ef6395313d0a361f3849e338a7cf6969.tar.bz2 android_packages_apps_Snap-f2ce69e2ef6395313d0a361f3849e338a7cf6969.zip | |
Merge "UI cleanup" into gb-ub-photos-bryce
| -rw-r--r-- | res/drawable/filtershow_drawing.png | bin | 0 -> 1277 bytes | |||
| -rw-r--r-- | res/menu/filtershow_activity_menu.xml | 7 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/res/drawable/filtershow_drawing.png b/res/drawable/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..566773dbe --- /dev/null +++ b/res/drawable/filtershow_drawing.png diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml index 4ea7d17fd..f62bf3967 100644 --- a/res/menu/filtershow_activity_menu.xml +++ b/res/menu/filtershow_activity_menu.xml @@ -2,18 +2,19 @@ <item android:id="@+id/menu_share" android:actionProviderClass="android.widget.ShareActionProvider" - android:showAsAction="always" + android:showAsAction="never" android:enabled="false" + android:visible="false" android:title="@string/share"/> <item android:id="@+id/undoButton" android:icon="@drawable/filtershow_button_undo" - android:showAsAction="never" + android:showAsAction="always" android:title="@string/filtershow_undo"/> <item android:id="@+id/redoButton" android:icon="@drawable/filtershow_button_redo" - android:showAsAction="never" + android:showAsAction="always" android:title="@string/filtershow_redo"/> <item android:id="@+id/resetHistoryButton" diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java index 8b8504bbc..dc59b0cfc 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java @@ -54,6 +54,8 @@ public class FilterDrawRepresentation extends FilterRepresentation { setTextId(R.string.imageDraw); setButtonId(R.id.drawOnImageButton); setEditorId(EditorDraw.ID); + setOverlayId(R.drawable.filtershow_drawing); + setOverlayOnly(true); } @Override diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java index fb396608a..3f823ea1e 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java @@ -30,6 +30,7 @@ public class FilterRedEyeRepresentation extends FilterPointRepresentation { super("RedEye",R.string.redeye,EditorRedEye.ID); setFilterClass(ImageFilterRedEye.class); setOverlayId(R.drawable.photoeditor_effect_redeye); + setOverlayOnly(true); } public void addRect(RectF rect, RectF bounds) { |
