commit aa77f39a3a18ee7945177189c358ef6208e6da2b
author Doris Liu <tianliu@google.com> Tue May 21 17:12:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 21 17:12:03 2013 +0000
tree 2331074209a0af8425aa13cf27b7f8145eed5390
parent a285bc130ff1175c60085410f317e90f6443c39b
parent 58ed4d197795147f9f4a202da00b411a6ed53bd2

Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d5a5ef9..02ffcc1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40011"
-        android:versionName="1.1.40011"
+<manifest android:versionCode="40012"
+        android:versionName="1.1.40012"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 

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

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index d13d261..e5ddbf5 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -433,6 +433,9 @@
     }
 
     public void showRepresentation(FilterRepresentation representation) {
+        if (representation == null) {
+            return;
+        }
         useFilterRepresentation(representation);
 
         // show representation
@@ -817,7 +820,8 @@
         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);