commit | 980202694fa6ad982fe04c5742c9042f47fe2dc2 | [log] [tgz] |
---|---|---|
author | Ray Chen <raychen@google.com> | Fri Nov 18 15:00:32 2011 +0800 |
committer | Ray Chen <raychen@google.com> | Fri Nov 18 16:02:59 2011 +0800 |
tree | a01f4364f17489913070c151e537121fc3018097 | |
parent | 4acafbe1b90e3d817ceb6fa965402e49236ca885 [diff] |
Fix 5635260 Albums view goes blank after changing view option and returning to albums view Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index c31e920..fb26fc6 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -443,6 +443,7 @@ } } + 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 98a35a1..717f16c 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -228,7 +228,7 @@ 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;