Fix state panel

Labels were not reflecting looks changes

bug:9746512
Change-Id: Ia2dd2a760f38dbd48c8a4d43e3d46ee2b875771f

3 files changed, 8 insertions, 10 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 8d581888c..4394cdee5 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -907,12 +907,12 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     public void setupMasterImage() {
         mImageLoader = new ImageLoader(this, getApplicationContext());
 
-        HistoryManager mHistoryManager = new HistoryManager();
-        StateAdapter mImageStateAdapter = new StateAdapter(this, 0);
+        HistoryManager historyManager = new HistoryManager();
+        StateAdapter imageStateAdapter = new StateAdapter(this, 0);
         MasterImage.reset();
         mMasterImage = MasterImage.getImage();
-        mMasterImage.setHistoryManager(mHistoryManager);
-        mMasterImage.setStateAdapter(mImageStateAdapter);
+        mMasterImage.setHistoryManager(historyManager);
+        mMasterImage.setStateAdapter(imageStateAdapter);
         mMasterImage.setActivity(this);
         mMasterImage.setImageLoader(mImageLoader);
 
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index ffd69a662..0890b7cd0 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -47,8 +47,6 @@ public class MasterImage implements RenderingRequestCaller {
     private boolean DEBUG  = false;
     private static final boolean DISABLEZOOM = false;
     private static MasterImage sMasterImage = null;
-    private static int sIconSeedSize = 128;
-    private static float sHistoryPreviewSize = 128.0f;
 
     private boolean mSupportsHighRes = false;
 
@@ -120,10 +118,6 @@ public class MasterImage implements RenderingRequestCaller {
         mSupportsHighRes = value;
     }
 
-    public static void setIconSeedSize(int iconSeedSize) {
-        sIconSeedSize = iconSeedSize;
-    }
-
     public void addObserver(ImageShow observer) {
         if (mObservers.contains(observer)) {
             return;
diff --git a/src/com/android/gallery3d/filtershow/state/State.java b/src/com/android/gallery3d/filtershow/state/State.java
index 29bbf9109..e7dedd6a2 100644
--- a/src/com/android/gallery3d/filtershow/state/State.java
+++ b/src/com/android/gallery3d/filtershow/state/State.java
@@ -16,6 +16,7 @@
 
 package com.android.gallery3d.filtershow.state;
 
+import com.android.gallery3d.filtershow.filters.FilterFxRepresentation;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
 
 public class State {
@@ -41,6 +42,9 @@ public class State {
                 != state.mFilterRepresentation.getFilterClass()) {
             return false;
         }
+        if (mFilterRepresentation instanceof FilterFxRepresentation) {
+            return mFilterRepresentation.equals(state.getFilterRepresentation());
+        }
         return true;
     }