Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce (a285bc13) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -433,6 +433,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
		}

		public void showRepresentation(FilterRepresentation representation) {
		if (representation == null) {
		return;
		}
		useFilterRepresentation(representation);

		// show representation
		@@ -817,7 +820,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
		loadXML();
		loadMainPanel();

		if (!mShowingTinyPlanet) {
		// mLoadBitmapTask==null implies you have looked at the intent
		if (!mShowingTinyPlanet && (mLoadBitmapTask == null)) {
		mCategoryFiltersAdapter.removeTinyPlanet();
		}
		final View loading = findViewById(R.id.loading);