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 | 8a415f457fe9fd18b369ac4ec354a33e3affcb94 (patch) | |
| tree | 7332a141c162714305b5aea73f9f05048ec2dd88 /src | |
| parent | 0eefb1733f5ff2e2f6f4846bdbd8873639b4d085 (diff) | |
| parent | 4c9e3e1d7a5af64ddc946297db9d07dc394d861e (diff) | |
| download | android_packages_apps_Gallery2-8a415f457fe9fd18b369ac4ec354a33e3affcb94.tar.gz android_packages_apps_Gallery2-8a415f457fe9fd18b369ac4ec354a33e3affcb94.tar.bz2 android_packages_apps_Gallery2-8a415f457fe9fd18b369ac4ec354a33e3affcb94.zip | |
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -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(); |