diff options
author | nicolasroard <nicolasroard@google.com> | 2013-04-15 14:41:00 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-04-15 23:13:37 -0700 |
commit | 191da1ab42e2a70989ad5527513a4d51af577d79 (patch) | |
tree | a0a2ea45525f022f0f318099803b62e8d16d4c73 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | |
parent | 6e8057ea04160a4aeb83dfe3b4f1d4d9520f5c8b (diff) | |
download | android_packages_apps_Snap-191da1ab42e2a70989ad5527513a4d51af577d79.tar.gz android_packages_apps_Snap-191da1ab42e2a70989ad5527513a4d51af577d79.tar.bz2 android_packages_apps_Snap-191da1ab42e2a70989ad5527513a4d51af577d79.zip |
New state panel
bug:8620913
bug:8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 94573bc61..c36befc2c 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -22,11 +22,11 @@ import android.os.Message; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.HistoryAdapter; -import com.android.gallery3d.filtershow.ImageStateAdapter; import com.android.gallery3d.filtershow.cache.*; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.presets.ImagePreset; +import com.android.gallery3d.filtershow.state.StateAdapter; import java.util.Vector; @@ -55,7 +55,7 @@ public class MasterImage implements RenderingRequestCaller { private ImageLoader mLoader = null; private HistoryAdapter mHistory = null; - private ImageStateAdapter mState = null; + private StateAdapter mState = null; private FilterShowActivity mActivity = null; @@ -192,7 +192,7 @@ public class MasterImage implements RenderingRequestCaller { return mHistory; } - public ImageStateAdapter getState() { + public StateAdapter getState() { return mState; } @@ -200,7 +200,7 @@ public class MasterImage implements RenderingRequestCaller { mHistory = adapter; } - public void setStateAdapter(ImageStateAdapter adapter) { + public void setStateAdapter(StateAdapter adapter) { mState = adapter; } |