summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-09-29 00:17:09 -0700
committernicolasroard <nicolasroard@google.com>2012-09-29 16:58:46 -0700
commitbf93da72576b28f4e9dfb27f8f3fef702c8ae82d (patch)
tree5ca0b579c4f9f8f910282adb961538a075418af8 /res/menu
parent0c3203f1789df3f8bd772dfd655e73b44636b629 (diff)
downloadandroid_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.tar.gz
android_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.tar.bz2
android_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.zip
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 bug:7256090 bug:7249672 bug:7234317 bug:7225150 Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/filtershow_activity_menu.xml11
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"/>