diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-18 17:34:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-18 17:34:27 -0700 |
| commit | 79704855fb9b83acf9dc505f9ab1989ec1c770bc (patch) | |
| tree | ac0a1a5e7a3422df7785709a6cca7eb45bd8a78a | |
| parent | 014a111f10a7523415ca210bc6fe1e4f00183d31 (diff) | |
| parent | c29588d7cc9fc3d2eef61af433fc0a8859e16ef4 (diff) | |
| download | android_packages_apps_Gallery2-79704855fb9b83acf9dc505f9ab1989ec1c770bc.tar.gz android_packages_apps_Gallery2-79704855fb9b83acf9dc505f9ab1989ec1c770bc.tar.bz2 android_packages_apps_Gallery2-79704855fb9b83acf9dc505f9ab1989ec1c770bc.zip | |
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index f900c408f..c8eaaca4a 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1309,6 +1309,14 @@ public class PhotoPage extends ActivityState implements @Override public void onFilmModeChanged(boolean enabled) { refreshBottomControlsWhenReady(); + if (mShowSpinner) { + if (enabled) { + mActionBar.enableAlbumModeMenu( + GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED, this); + } else { + mActionBar.disableAlbumModeMenu(true); + } + } if (enabled) { mHandler.removeMessages(MSG_HIDE_BARS); } else { @@ -1369,7 +1377,7 @@ public class PhotoPage extends ActivityState implements ((mSecureAlbum == null) && (mSetPathString != null)), false); mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); refreshBottomControlsWhenReady(); - if (mShowSpinner) { + if (mShowSpinner && mPhotoView.getFilmMode()) { mActionBar.enableAlbumModeMenu( GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED, this); } |