diff options
| author | Ray Chen <raychen@google.com> | 2011-09-08 20:54:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 20:54:42 -0700 |
| commit | 27ad8403dbdd74481514851fe98c5da73198d911 (patch) | |
| tree | deb9fc165a45bb68ba246c504dae42079a9183c1 | |
| parent | 5327226d6401e54e1f32783ea8e03ff05dd4cc1a (diff) | |
| parent | eab374bafe5237a77698c4135c92eb26faedfa2b (diff) | |
| download | android_packages_apps_Gallery2-27ad8403dbdd74481514851fe98c5da73198d911.tar.gz android_packages_apps_Gallery2-27ad8403dbdd74481514851fe98c5da73198d911.tar.bz2 android_packages_apps_Gallery2-27ad8403dbdd74481514851fe98c5da73198d911.zip | |
Merge "Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index efa5fa5e8..3df5e91e7 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -159,13 +159,16 @@ public class GalleryActionBar implements ActionBar.TabListener { public void showClusterTabs(ClusterRunner runner) { Log.v(TAG, "showClusterTabs: runner=" + runner); + // setNavigationMode will trigger onTabSelected, so we should avoid + // triggering any callback here + mClusterRunner = null; mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); mClusterRunner = runner; } public void hideClusterTabs() { - mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); mClusterRunner = null; + mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); Log.v(TAG, "hideClusterTabs: runner=" + mClusterRunner); } |