summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-03 15:58:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-03 15:58:42 -0700
commitd37dc7f6660d2d01768f93113cbe6efba2448ad0 (patch)
treea65ccfbd2286b6db857934ffc315f105f6589a36
parent619471756d8e82ca3b6ba69b2c2d0e81b6031284 (diff)
parent10f94c1c42aea7df1c66a91f427f8f831718cc32 (diff)
downloadandroid_packages_apps_Snap-d37dc7f6660d2d01768f93113cbe6efba2448ad0.tar.gz
android_packages_apps_Snap-d37dc7f6660d2d01768f93113cbe6efba2448ad0.tar.bz2
android_packages_apps_Snap-d37dc7f6660d2d01768f93113cbe6efba2448ad0.zip
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java4
-rw-r--r--src/com/android/gallery3d/ui/MenuExecutor.java1
2 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 39b8c382b..3c64fa32b 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -939,10 +939,6 @@ 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 070271739..1f9d0c434 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -175,7 +175,6 @@ 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);