Fix 5520606: Should be able to deselect the effect selected to clear effects.

Change-Id: I41ea0d23b4ec83f5205fbe1324fb997a1d0971f3

1 files changed, 11 insertions, 3 deletions

diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java
index c4a4d49..a0f9be0 100644
--- a/src/com/android/camera/ui/EffectSettingPopup.java
+++ b/src/com/android/camera/ui/EffectSettingPopup.java
@@ -180,11 +180,19 @@ public class EffectSettingPopup extends AbstractSettingPopup implements
     @Override
     public void onItemClick(AdapterView<?> parent, View view,
             int index, long id) {
+        String value;
         if (parent == mSillyFacesGrid) {
-            String value = (String) mSillyFacesItem.get(index).get("value");
-            mPreference.setValue(value);
+            value = (String) mSillyFacesItem.get(index).get("value");
         } else if (parent == mBackgroundGrid) {
-            String value = (String) mBackgroundItem.get(index).get("value");
+            value = (String) mBackgroundItem.get(index).get("value");
+        } else {
+            return;
+        }
+
+        // Tapping the selected effect will deselect it (clear effects).
+        if (value.equals(mPreference.getValue())) {
+            mPreference.setValue(mNoEffect);
+        } else {
             mPreference.setValue(value);
         }
         reloadPreference();