summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-03-20 16:29:42 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:19 -0700
commit1291323a43411b6a56bef67818c3a1e2c0108ec2 (patch)
treec70600157e7187dd4109ac81cbec61cb1f36128d
parentaaf13775fda19dd6005a3e98a9fc80b17bfcc93b (diff)
downloadandroid_packages_apps_Gallery2-1291323a43411b6a56bef67818c3a1e2c0108ec2.tar.gz
android_packages_apps_Gallery2-1291323a43411b6a56bef67818c3a1e2c0108ec2.tar.bz2
android_packages_apps_Gallery2-1291323a43411b6a56bef67818c3a1e2c0108ec2.zip
Gallery2-Add Presentation judgement in State Equel
In filtershow state equel judgement, there is only one condition of Filter Class There should be another three conditions of FilterFxRepresentation, FilterImageBorderRepresentation and FilterColorBorderRepresentation CRs-fixed: 624591 Change-Id: I19f93d7bbaeb69048698c804eb50712581d87fd1
-rw-r--r--src/com/android/gallery3d/filtershow/state/State.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/state/State.java b/src/com/android/gallery3d/filtershow/state/State.java
index e7dedd6a2..3b86bd3ed 100644
--- a/src/com/android/gallery3d/filtershow/state/State.java
+++ b/src/com/android/gallery3d/filtershow/state/State.java
@@ -18,6 +18,9 @@ package com.android.gallery3d.filtershow.state;
import com.android.gallery3d.filtershow.filters.FilterFxRepresentation;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterFxRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterImageBorderRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterColorBorderRepresentation;
public class State {
private String mText;
@@ -42,7 +45,9 @@ public class State {
!= state.mFilterRepresentation.getFilterClass()) {
return false;
}
- if (mFilterRepresentation instanceof FilterFxRepresentation) {
+ if (mFilterRepresentation instanceof FilterFxRepresentation
+ || mFilterRepresentation instanceof FilterImageBorderRepresentation
+ || mFilterRepresentation instanceof FilterColorBorderRepresentation) {
return mFilterRepresentation.equals(state.getFilterRepresentation());
}
return true;