diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-23 11:53:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 11:53:13 -0700 |
| commit | 8ad95f9f9031f7c96f3793bf2850b8a516fcca6d (patch) | |
| tree | 8de09774cd135294985e4365679d15ff9517ca44 | |
| parent | 1371fc6c86fdc0faa44f276386565c3325e3c280 (diff) | |
| parent | b818cbe38468eb79f5d85f6738b8264451cf4356 (diff) | |
| download | android_packages_apps_Snap-8ad95f9f9031f7c96f3793bf2850b8a516fcca6d.tar.gz android_packages_apps_Snap-8ad95f9f9031f7c96f3793bf2850b8a516fcca6d.tar.bz2 android_packages_apps_Snap-8ad95f9f9031f7c96f3793bf2850b8a516fcca6d.zip | |
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0':
Show Panorama viewer button in filmstrip mode
| -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; } |