diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-09-30 23:58:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-30 23:58:36 -0700 |
| commit | 4367088e5419630afb1e849fc6ffbe885c0a9c1d (patch) | |
| tree | 003146175dbff72bcd5c2ed5a2c55bfe20c119f7 /res/menu | |
| parent | 27a265c696064fd5fe4cdc1835e6ef9b2b141d8a (diff) | |
| parent | ba1ba19c27e90694f74985b37b7bcaea6c023621 (diff) | |
| download | android_packages_apps_Snap-4367088e5419630afb1e849fc6ffbe885c0a9c1d.tar.gz android_packages_apps_Snap-4367088e5419630afb1e849fc6ffbe885c0a9c1d.tar.bz2 android_packages_apps_Snap-4367088e5419630afb1e849fc6ffbe885c0a9c1d.zip | |
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/filtershow_activity_menu.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml index f0c0f3247..8987e48e4 100644 --- a/res/menu/filtershow_activity_menu.xml +++ b/res/menu/filtershow_activity_menu.xml @@ -8,21 +8,26 @@ <item android:id="@+id/undoButton" android:icon="@drawable/filtershow_button_undo" - android:showAsAction="always" + android:showAsAction="never" android:title="@string/filtershow_undo"/> <item android:id="@+id/redoButton" android:icon="@drawable/filtershow_button_redo" - android:showAsAction="always" + android:showAsAction="never" android:title="@string/filtershow_redo"/> <item android:id="@+id/operationsButton" android:icon="@drawable/filtershow_button_operations" - android:showAsAction="ifRoom" + android:showAsAction="never" android:title="@string/show_history_panel"/> <item + android:id="@+id/showImageStateButton" + android:showAsAction="never" + android:title="@string/show_imagestate_panel" /> + <item android:id="@+id/menu_settings" android:enabled="false" + android:showAsAction="never" android:orderInCategory="100" android:title="@string/menu_settings"/> |