diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-04 11:59:01 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-10-04 11:59:01 -0700 |
| commit | 4c9e3e1d7a5af64ddc946297db9d07dc394d861e (patch) | |
| tree | 7e81fa7ce27b839b4523bae23810ec126cfbc0fb /src/com/android/gallery3d/app/AlbumPage.java | |
| parent | 2abc1350cde24e810f6437592f099c149ce19ada (diff) | |
| download | android_packages_apps_Gallery2-4c9e3e1d7a5af64ddc946297db9d07dc394d861e.tar.gz android_packages_apps_Gallery2-4c9e3e1d7a5af64ddc946297db9d07dc394d861e.tar.bz2 android_packages_apps_Gallery2-4c9e3e1d7a5af64ddc946297db9d07dc394d861e.zip | |
Don't allow switching to filmstrip in get content intent
Bug: 7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
| -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(); |