Merge "Update to sharing panorama" into gb-ub-photos-arches
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index aeef78f..984a944 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -19,12 +19,22 @@
android:icon="@drawable/ic_menu_ptp_holo_light"
android:showAsAction="always|withText"
android:visible="false" />
+ <!-- Ideally, showAsAction for share_panorama and share should be reversed.
+ But, if share_panorama is set to never, it doesn't seem to get promoted
+ to the action bar and stays on the overflow menu. -->
+ <item android:id="@+id/action_share_panorama"
+ android:icon="@drawable/ic_menu_share_holo_light"
+ android:title="@string/share_panorama"
+ android:visible="false"
+ android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
+ android:showAsAction="ifRoom">
+ </item>
<item android:id="@+id/action_share"
android:icon="@drawable/ic_menu_share_holo_light"
android:title="@string/share"
android:visible="false"
android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
- android:showAsAction="ifRoom">
+ android:showAsAction="never">
</item>
<item android:id="@+id/action_delete"
android:icon="@drawable/ic_menu_trash_holo_light"
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index 0dcc3f7..5fe5187 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -19,13 +19,21 @@
android:icon="@drawable/ic_menu_ptp_holo_light"
android:showAsAction="always|withText"
android:visible="false" />
- <item android:id="@+id/action_share"
+ <!-- Ideally, showAsAction for share_panorama and share should be reversed.
+ But, if share_panorama is set to never, it doesn't seem to get promoted
+ to the action bar and stays on the overflow menu. -->
+ <item android:id="@+id/action_share_panorama"
android:icon="@drawable/ic_menu_share_holo_light"
- android:title="@string/share"
- android:enabled="true"
+ android:title="@string/share_panorama"
android:visible="false"
android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="ifRoom" />
+ <item android:id="@+id/action_share"
+ android:icon="@drawable/ic_menu_share_holo_light"
+ android:title="@string/share"
+ android:visible="false"
+ android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
+ android:showAsAction="never" />
<item android:id="@+id/action_grid"
android:icon="@android:drawable/ic_dialog_dialer"
android:title="@string/switch_photo_grid"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed121d4..7323a7d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -110,6 +110,8 @@
<string name="confirm">Confirm</string>
<string name="cancel">Cancel</string>
<string name="share">Share</string>
+ <string name="share_panorama">Share panorama</string>
+ <string name="share_as_photo">Share as photo</string>
<!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
<string name="deleted">Deleted</string>