diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-06-03 15:41:36 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-06-05 10:50:46 -0700 |
commit | 17fbd7949abfd2dee5b15e443611c56dac2d6ef3 (patch) | |
tree | a44c2c219a66d91bc725b677c350f7716ab34f21 /src/com/android/gallery3d/filtershow/category | |
parent | 8ce743f577b2056519fd8e74da272c461ff74e33 (diff) | |
download | android_packages_apps_Snap-17fbd7949abfd2dee5b15e443611c56dac2d6ef3.tar.gz android_packages_apps_Snap-17fbd7949abfd2dee5b15e443611c56dac2d6ef3.tar.bz2 android_packages_apps_Snap-17fbd7949abfd2dee5b15e443611c56dac2d6ef3.zip |
Removing unused UI fields in FilterRepresentation.
Bug: 9170644
Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
Diffstat (limited to 'src/com/android/gallery3d/filtershow/category')
-rw-r--r-- | src/com/android/gallery3d/filtershow/category/Action.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/category/CategoryAdapter.java | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java index 4f2c12868..506b2bf0f 100644 --- a/src/com/android/gallery3d/filtershow/category/Action.java +++ b/src/com/android/gallery3d/filtershow/category/Action.java @@ -149,7 +149,7 @@ public class Action implements RenderingRequestCaller { mRepresentation.getOverlayId()); } if (mOverlayBitmap != null) { - if (getRepresentation().getPriority() == FilterRepresentation.TYPE_BORDER) { + if (getRepresentation().getFilterType() == FilterRepresentation.TYPE_BORDER) { Canvas canvas = new Canvas(mImage); canvas.drawBitmap(mOverlayBitmap, new Rect(0, 0, mOverlayBitmap.getWidth(), mOverlayBitmap.getHeight()), new Rect(0, 0, mImage.getWidth(), mImage.getHeight()), new Paint()); diff --git a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java index cfa64bc3c..ba0ff33dd 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java @@ -26,6 +26,7 @@ import android.widget.ListView; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; +import com.android.gallery3d.filtershow.filters.FilterTinyPlanetRepresentation; import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; @@ -158,8 +159,8 @@ public class CategoryAdapter extends ArrayAdapter<Action> { for (int i = 0; i < getCount(); i++) { Action action = getItem(i); if (action.getRepresentation() != null - && action.getRepresentation().getFilterClass() - == ImageFilterTinyPlanet.class) { + && action.getRepresentation() + instanceof FilterTinyPlanetRepresentation) { return action.getRepresentation(); } } @@ -170,8 +171,8 @@ public class CategoryAdapter extends ArrayAdapter<Action> { for (int i = 0; i < getCount(); i++) { Action action = getItem(i); if (action.getRepresentation() != null - && action.getRepresentation().getFilterClass() - == ImageFilterTinyPlanet.class) { + && action.getRepresentation() + instanceof FilterTinyPlanetRepresentation) { remove(action); return; } |