From 673f7408a381705db18e87243755e5ec19247290 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Mon, 15 Apr 2013 14:41:00 -0700
Subject: New state panel

bug:8620913
bug:8503386

Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
---
 src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 00f5977d1..bd2f494cd 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -21,15 +21,14 @@ import android.graphics.Rect;
 import android.support.v8.renderscript.Allocation;
 import android.util.Log;
 
-import com.android.gallery3d.filtershow.ImageStateAdapter;
 import com.android.gallery3d.filtershow.cache.CachingPipeline;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.BaseFiltersManager;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
-import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
+import com.android.gallery3d.filtershow.state.StateAdapter;
 
 import java.util.Vector;
 
@@ -533,14 +532,11 @@ public class ImagePreset {
         return true;
     }
 
-    public void fillImageStateAdapter(ImageStateAdapter imageStateAdapter) {
+    public void fillImageStateAdapter(StateAdapter imageStateAdapter) {
         if (imageStateAdapter == null) {
             return;
         }
-        imageStateAdapter.clear();
-        // TODO: re-enable the state panel
         imageStateAdapter.addAll(mFilters);
-        imageStateAdapter.notifyDataSetChanged();
     }
 
     public void setPartialRendering(boolean partialRendering, Rect bounds) {
-- 
cgit v1.2.3