From 90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Tue, 23 Oct 2012 11:20:48 -0700
Subject: Show Panorama viewer button in filmstrip mode

Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
---
 src/com/android/gallery3d/app/PhotoPage.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index fb4e88b2a..00190572a 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -597,7 +597,7 @@ public class PhotoPage extends ActivityState implements
 
     @Override
     public boolean canDisplayBottomControls() {
-        return mIsActive && !mPhotoView.getFilmMode();
+        return mIsActive;
     }
 
     @Override
@@ -608,13 +608,14 @@ public class PhotoPage extends ActivityState implements
         switch(control) {
             case R.id.photopage_bottom_control_edit:
                 return mHaveImageEditor && mShowBars
+                        && !mPhotoView.getFilmMode()
                         && (mCurrentPhoto.getSupportedOperations() & MediaItem.SUPPORT_EDIT) != 0
                         && mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE;
             case R.id.photopage_bottom_control_panorama:
                 return mIsPanorama;
             case R.id.photopage_bottom_control_tiny_planet:
                 return mHaveImageEditor && mShowBars
-                        && mIsPanorama360;
+                        && mIsPanorama360 && !mPhotoView.getFilmMode();
             default:
                 return false;
         }
-- 
cgit v1.2.3