diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-13 04:44:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-13 04:44:32 -0800 |
| commit | c6f3cc36965ddbc3d47894875ac948b03b7bc6cd (patch) | |
| tree | 1f1fdc5689365ad2b0425bf6d492c58862cccb5b /src | |
| parent | 73f91815e24819ea5d4156e78337db4db38be5da (diff) | |
| parent | 807e83e760488e00daa8f9eee0e3dee3e357c4a1 (diff) | |
| download | android_packages_apps_Gallery2-c6f3cc36965ddbc3d47894875ac948b03b7bc6cd.tar.gz android_packages_apps_Gallery2-c6f3cc36965ddbc3d47894875ac948b03b7bc6cd.tar.bz2 android_packages_apps_Gallery2-c6f3cc36965ddbc3d47894875ac948b03b7bc6cd.zip | |
Merge "Gallery2: Fix menu display inconsistent with its cluster"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |