summaryrefslogtreecommitdiffstats
path: root/res/menu/photo.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu/photo.xml')
-rw-r--r--res/menu/photo.xml19
1 files changed, 8 insertions, 11 deletions
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index d01ba2859..b5103579e 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -14,19 +14,21 @@
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:showAsAction="always">
- <!-- We need this to create a dynamic list of submenu -->
- <menu />
- </item>
+ android:showAsAction="ifRoom" />
<item android:id="@+id/action_delete"
android:icon="@drawable/ic_menu_trash_holo_light"
android:title="@string/delete"
- android:showAsAction="always">
+ android:showAsAction="ifRoom">
<menu>
<item android:id="@+id/action_confirm_delete"
android:icon="@drawable/ic_menu_trash_holo_light"
@@ -39,12 +41,7 @@
<item android:id="@+id/action_slideshow"
android:icon="@drawable/ic_menu_slideshow_holo_light"
android:title="@string/slideshow"
- android:showAsAction="always" />
- <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" />
+ android:showAsAction="never" />
<item android:id="@+id/action_details"
android:title="@string/details"
android:showAsAction="never" />