From 00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@google.com>
Date: Fri, 18 Nov 2011 15:00:32 +0800
Subject: [PATCH] Fix 5635260 Albums view goes blank after changing view option
 and returning to albums view

Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
---
 src/com/android/gallery3d/app/AlbumSetPage.java     | 1 +
 src/com/android/gallery3d/app/GalleryActionBar.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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;
-- 
2.11.0