diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-09-27 21:43:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-27 21:43:58 -0700 |
| commit | dcd0a794cd6d9d6726a3c285b8a00a295293a27c (patch) | |
| tree | afeef0623001dbfc24b7caf4f1b0a99f121b8bb2 /res/menu | |
| parent | ed4cddcd2b11f841564de4ec2082ed2579199378 (diff) | |
| parent | 78042f39d3a48819303f2a78151a6a78f766096c (diff) | |
| download | android_packages_apps_Snap-dcd0a794cd6d9d6726a3c285b8a00a295293a27c.tar.gz android_packages_apps_Snap-dcd0a794cd6d9d6726a3c285b8a00a295293a27c.tar.bz2 android_packages_apps_Snap-dcd0a794cd6d9d6726a3c285b8a00a295293a27c.zip | |
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/filtershow_activity_menu.xml | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml index 44a11e7db..ba0a8bcf4 100644 --- a/res/menu/filtershow_activity_menu.xml +++ b/res/menu/filtershow_activity_menu.xml @@ -1,5 +1,29 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/menu_settings" - android:title="@string/menu_settings" - android:orderInCategory="100" /> -</menu> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + <item + android:id="@+id/menu_share" + android:actionProviderClass="android.widget.ShareActionProvider" + android:showAsAction="ifRoom" + android:enabled="false" + android:title="@string/share"/> + <item + android:id="@+id/undoButton" + android:icon="@drawable/filtershow_button_undo" + android:showAsAction="ifRoom" + android:title="@string/filtershow_undo"/> + <item + android:id="@+id/redoButton" + android:icon="@drawable/filtershow_button_redo" + android:showAsAction="ifRoom" + android:title="@string/filtershow_redo"/> + <item + android:id="@+id/operationsButton" + android:icon="@drawable/filtershow_button_operations" + android:showAsAction="ifRoom" + android:title="@string/show_history_panel"/> + <item + android:id="@+id/menu_settings" + android:enabled="false" + android:orderInCategory="100" + android:title="@string/menu_settings"/> + +</menu>
\ No newline at end of file |