diff options
| -rw-r--r-- | res/menu/operation.xml | 10 | ||||
| -rw-r--r-- | res/menu/photo.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/MenuExecutor.java | 1 |
5 files changed, 15 insertions, 4 deletions
diff --git a/res/menu/operation.xml b/res/menu/operation.xml index d1791e22f..15e6413d1 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -27,15 +27,17 @@ android:title="@string/share_panorama" android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" - android:showAsAction="ifRoom"> - </item> + android:showAsAction="ifRoom" /> + <item android:id="@+id/action_view_panorama" + android:title="@string/view_panorama" + android:showAsAction="never" + android:visible="false" /> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" - android:showAsAction="never"> - </item> + android:showAsAction="never" /> <item android:id="@+id/action_delete" android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index 569272e68..889dc40c1 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -28,6 +28,9 @@ android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom" /> + <item android:id="@+id/action_view_panorama" + android:title="@string/view_panorama" + android:showAsAction="never" /> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" diff --git a/res/values/strings.xml b/res/values/strings.xml index 61b45a28b..ede2bed0d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -111,6 +111,7 @@ <string name="cancel">Cancel</string> <string name="share">Share</string> <string name="share_panorama">Share panorama</string> + <string name="view_panorama">View in 360\u00b0</string> <string name="share_as_photo">Share as photo</string> <!-- The label shown after an image is deleted [CHAR LIMIT=16] --> diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 3c64fa32b..39b8c382b 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -939,6 +939,10 @@ public class PhotoPage extends ActivityState implements mMenuExecutor.onMenuClicked(item, confirmMsg, new ImportCompleteListener(mActivity)); return true; + case R.id.action_view_panorama: + LightCycleHelper.viewPanorama(mActivity, + manager.getContentUri(path)); + return true; default : return false; } diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index 1f9d0c434..070271739 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -175,6 +175,7 @@ public class MenuExecutor { setMenuItemVisible(menu, R.id.action_crop, supportCrop); setMenuItemVisible(menu, R.id.action_trim, supportTrim); setMenuItemVisible(menu, R.id.action_share_panorama, supportSharePanorama); + setMenuItemVisible(menu, R.id.action_view_panorama, supportSharePanorama); setMenuItemVisible(menu, R.id.action_share, supportShare); setMenuItemVisible(menu, R.id.action_setas, supportSetAs); setMenuItemVisible(menu, R.id.action_show_on_map, supportShowOnMap); |