summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-03-04 17:50:58 -0800
committerJohn Hoford <hoford@google.com>2013-03-04 17:54:16 -0800
commit5300e0c54110d67f85fdb2ee9c90be58f50ca4ac (patch)
treee5b2d0c6074d25a7f8febba0e21bdbd340c25594 /src
parentcdea10749cbdb6bab8f49f1b5b562b6e89781981 (diff)
downloadandroid_packages_apps_Gallery2-5300e0c54110d67f85fdb2ee9c90be58f50ca4ac.tar.gz
android_packages_apps_Gallery2-5300e0c54110d67f85fdb2ee9c90be58f50ca4ac.tar.bz2
android_packages_apps_Gallery2-5300e0c54110d67f85fdb2ee9c90be58f50ca4ac.zip
fix tiny planet shown after rotation
Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index e5d3ac655..fbaec849b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -123,6 +123,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
protected static final boolean ANIMATE_PANELS = true;
private static int mImageBorderSize = 4; // in percent
+ private boolean mShowingTinyPlanet = false;
private boolean mShowingHistoryPanel = false;
private boolean mShowingImageStatePanel = false;
@@ -373,6 +374,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
View tinyPlanetView = findViewById(EditorTinyPlanet.ID);
if (tinyPlanetView != null) {
+ mShowingTinyPlanet = false;
tinyPlanetView.setVisibility(View.GONE);
}
mLoadBitmapTask = new LoadBitmapTask(tinyPlanetView);
@@ -453,6 +455,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
return;
}
if (values[0]) {
+ mShowingTinyPlanet = true;
mTinyPlanetButton.setVisibility(View.VISIBLE);
}
}
@@ -871,6 +874,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
if (mShowingHistoryPanel) {
toggleHistoryPanel();
}
+ if (mShowingTinyPlanet == false) {
+ View tinyPlanetView = findViewById(EditorTinyPlanet.ID);
+ if (tinyPlanetView != null) {
+ tinyPlanetView.setVisibility(View.GONE);
+ }
+ }
final View loading = findViewById(R.id.loading);
loading.setVisibility(View.GONE);
}