From 807e83e760488e00daa8f9eee0e3dee3e357c4a1 Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Sat, 26 Apr 2014 10:27:13 +0800 Subject: Gallery2: Fix menu display inconsistent with its cluster MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The operation order is not correct.We should first execute the change of cluster,then display menu title according to the cluster.But we do the opposite operation,which cause the menu will always display last cluster‘s corresponding menu and cause this bug happened. Modify the operation order. CRs-fixed: 619812 Change-Id: I6cd3c82e065cef5a463e06295bf332e1459500e3 --- src/com/android/gallery3d/app/AlbumSetPage.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/com/android/gallery3d/app/AlbumSetPage.java') diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 1dca84068..068ac33a0 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -547,6 +547,13 @@ public class AlbumSetPage extends ActivityState implements inflater.inflate(R.menu.albumset, menu); boolean wasShowingClusterMenu = mShowClusterMenu; mShowClusterMenu = !inAlbum; + if (mShowClusterMenu != wasShowingClusterMenu) { + if (mShowClusterMenu) { + mActionBar.enableClusterMenu(mSelectedAction, this); + } else { + mActionBar.disableClusterMenu(true); + } + } boolean selectAlbums = !inAlbum && mActionBar.getClusterTypeAction() == FilterUtils.CLUSTER_BY_ALBUM; MenuItem selectItem = menu.findItem(R.id.action_select); @@ -571,13 +578,6 @@ public class AlbumSetPage extends ActivityState implements mActionBar.setTitle(mTitle); mActionBar.setSubtitle(mSubtitle); - if (mShowClusterMenu != wasShowingClusterMenu) { - if (mShowClusterMenu) { - mActionBar.enableClusterMenu(mSelectedAction, this); - } else { - mActionBar.disableClusterMenu(true); - } - } } return true; } -- cgit v1.2.3