diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-23 11:51:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 11:51:07 -0700 |
| commit | b818cbe38468eb79f5d85f6738b8264451cf4356 (patch) | |
| tree | 45bd1142fa4a3c9818d82309d305bee48ab7d91e /src | |
| parent | 983f612476c394dffcd2b73869ed3c92f531e5e1 (diff) | |
| parent | 90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6 (diff) | |
| download | android_packages_apps_Snap-b818cbe38468eb79f5d85f6738b8264451cf4356.tar.gz android_packages_apps_Snap-b818cbe38468eb79f5d85f6738b8264451cf4356.tar.bz2 android_packages_apps_Snap-b818cbe38468eb79f5d85f6738b8264451cf4356.zip | |
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |