diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-04-30 03:44:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 03:44:31 -0700 |
| commit | 82af7be9e2053965ee4f524cae4912b20ccbd8fa (patch) | |
| tree | c1415788f590d33ddab32d9ed0717c8fda9f13d9 | |
| parent | b5dc542fbaeaf99bebdcf775ef0e034e89e88eae (diff) | |
| parent | 8ade16daa59f135cf321c1a8b78a88d3f3fb100a (diff) | |
| download | android_packages_apps_Gallery2-82af7be9e2053965ee4f524cae4912b20ccbd8fa.tar.gz android_packages_apps_Gallery2-82af7be9e2053965ee4f524cae4912b20ccbd8fa.tar.bz2 android_packages_apps_Gallery2-82af7be9e2053965ee4f524cae4912b20ccbd8fa.zip | |
Merge "Expose delete button in action bar in portrait." into jb-dev
| -rw-r--r-- | res/menu-land/photo.xml | 60 | ||||
| -rw-r--r-- | res/menu/photo.xml | 8 |
2 files changed, 4 insertions, 64 deletions
diff --git a/res/menu-land/photo.xml b/res/menu-land/photo.xml deleted file mode 100644 index 21f802a25..000000000 --- a/res/menu-land/photo.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/action_import" - android:title="@string/Import" - android:icon="@drawable/ic_menu_ptp_holo_light" - android:showAsAction="always|withText" - android:visible="false" /> - <item android:id="@+id/action_share" - android:icon="@drawable/ic_menu_share_holo_light" - android:title="@string/share" - android:enabled="true" - android:actionProviderClass="android.widget.ShareActionProvider" - android:visible="false" - android:showAsAction="ifRoom" /> - <item android:id="@+id/action_delete" - android:icon="@drawable/ic_menu_trash_holo_light" - android:title="@string/delete" - android:visible="false" - android:showAsAction="ifRoom" /> - <item android:id="@+id/action_slideshow" - android:icon="@drawable/ic_menu_slideshow_holo_light" - android:title="@string/slideshow" - android:showAsAction="never" /> - <item android:id="@+id/action_edit" - android:title="@string/edit" - android:showAsAction="never" - android:visible="false" /> - <item android:id="@+id/action_rotate_ccw" - android:showAsAction="never" - android:title="@string/rotate_left" /> - <item android:id="@+id/action_rotate_cw" - android:showAsAction="never" - android:title="@string/rotate_right" /> - <item android:id="@+id/action_crop" - android:title="@string/crop_action" - android:showAsAction="never" /> - <item android:id="@+id/action_setas" - android:title="@string/set_image" - android:showAsAction="never" /> - <item android:id="@+id/action_details" - android:title="@string/details" - android:showAsAction="never" /> - <item android:id="@+id/action_show_on_map" - android:title="@string/show_on_map" - android:showAsAction="never" /> -</menu> diff --git a/res/menu/photo.xml b/res/menu/photo.xml index 685627a4f..21f802a25 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -30,7 +30,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="never" /> + android:showAsAction="ifRoom" /> <item android:id="@+id/action_slideshow" android:icon="@drawable/ic_menu_slideshow_holo_light" android:title="@string/slideshow" @@ -48,12 +48,12 @@ <item android:id="@+id/action_crop" android:title="@string/crop_action" android:showAsAction="never" /> - <item android:id="@+id/action_details" - android:title="@string/details" - android:showAsAction="never" /> <item android:id="@+id/action_setas" android:title="@string/set_image" android:showAsAction="never" /> + <item android:id="@+id/action_details" + android:title="@string/details" + android:showAsAction="never" /> <item android:id="@+id/action_show_on_map" android:title="@string/show_on_map" android:showAsAction="never" /> |