diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-23 11:20:48 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-10-23 11:28:03 -0700 |
| commit | 90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6 (patch) | |
| tree | f332e4217dbbba41628c3793f4feb5e3c4a4cf16 | |
| parent | cd0a788658ae61e215a677635779a3313e483d96 (diff) | |
| download | android_packages_apps_Snap-90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6.tar.gz android_packages_apps_Snap-90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6.tar.bz2 android_packages_apps_Snap-90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6.zip | |
Show Panorama viewer button in filmstrip mode
Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
| -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; } |