diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-04 14:02:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 14:02:37 -0700 |
commit | c422bd02c4063513e9974dfead3eb12f329bacb8 (patch) | |
tree | 533a1538059d75e651e697c4b1c26daa915cd126 | |
parent | e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa (diff) | |
parent | dbf60d199b4bc8fce3ace348e54308880b5eb599 (diff) | |
download | android_packages_apps_Snap-c422bd02c4063513e9974dfead3eb12f329bacb8.tar.gz android_packages_apps_Snap-c422bd02c4063513e9974dfead3eb12f329bacb8.tar.bz2 android_packages_apps_Snap-c422bd02c4063513e9974dfead3eb12f329bacb8.zip |
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
-rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 6736d350c..9cc56cc50 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -401,7 +401,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster mParentMediaSetString != null; GalleryActionBar actionBar = mActivity.getGalleryActionBar(); actionBar.setDisplayOptions(enableHomeButton, false); - actionBar.enableAlbumModeMenu(GalleryActionBar.ALBUM_GRID_MODE_SELECTED, this); + if (!mGetContent) { + actionBar.enableAlbumModeMenu(GalleryActionBar.ALBUM_GRID_MODE_SELECTED, this); + } // Set the reload bit here to prevent it exit this page in clearLoadingBit(). setLoadingBit(BIT_LOADING_RELOAD); @@ -425,7 +427,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster mAlbumDataAdapter.pause(); mAlbumView.pause(); DetailsHelper.pause(); - mActivity.getGalleryActionBar().disableAlbumModeMenu(true); + if (!mGetContent) { + mActivity.getGalleryActionBar().disableAlbumModeMenu(true); + } if (mSyncTask != null) { mSyncTask.cancel(); |