diff options
| author | Ray Chen <raychen@google.com> | 2011-11-18 15:00:32 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2011-11-18 16:02:59 +0800 |
| commit | 00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa (patch) | |
| tree | cf9339fe77bc9a1c751c907b434c8965ad97c4b4 /src | |
| parent | 71a296c27389fefa9361adada41715ae4623af32 (diff) | |
| download | android_packages_apps_Gallery2-00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa.tar.gz android_packages_apps_Gallery2-00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa.tar.bz2 android_packages_apps_Gallery2-00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa.zip | |
Fix 5635260 Albums view goes blank after changing view option and returning to albums view
Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index c31e920a8..fb26fc600 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -443,6 +443,7 @@ public class AlbumSetPage extends ActivityState implements } } + FilterUtils.setupMenuItems(actionBar, mMediaSet.getPath(), false); MenuItem switchCamera = menu.findItem(R.id.action_camera); if (switchCamera != null) { switchCamera.setVisible(GalleryUtils.isCameraAvailable(activity)); diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index 98a35a153..717f16c6f 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -228,7 +228,7 @@ public class GalleryActionBar implements ActionBar.OnNavigationListener { public boolean setSelectedAction(int type) { for (int i = 0, n = sClusterItems.length; i < n; i++) { ActionItem item = sClusterItems[i]; - if (item.visible && item.action == type) { + if (item.action == type) { mActionBar.setSelectedNavigationItem(i); mCurrentIndex = i; return true; |