SnapdragonCamera: Color Effect shows the current status

Let the icon shows the current status of the color effect on/off

Change-Id: I1c3719db15d4dd920b89591064cda372c7ab89be
CRs-Fixed: 951550

1 files changed, 24 insertions, 3 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 83ceff0b6..2cb544e6e 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1085,14 +1085,18 @@ public class PhotoMenu extends MenuController
     public void initFilterModeButton(View button) {
         button.setVisibility(View.INVISIBLE);
         final IconListPreference pref = (IconListPreference) mPreferenceGroup
-                .findPreference(CameraSettings.KEY_COLOR_EFFECT);
+                .findPreference(CameraSettings.KEY_FILTER_MODE);
         if (pref == null)
             return;
 
         int[] iconIds = pref.getLargeIconIds();
+        int index = pref.findIndexOfValue(pref.getValue());
         int resid = -1;
-        // The preference only has a single icon to represent it.
-        resid = pref.getSingleIcon();
+        if (!pref.getUseSingleIcon() && iconIds != null) {
+            resid = iconIds[index];
+        } else {
+            resid = pref.getSingleIcon();
+        }
         ((ImageView) button).setImageResource(resid);
         button.setVisibility(View.VISIBLE);
         button.setOnClickListener(new OnClickListener() {
@@ -1188,6 +1192,7 @@ public class PhotoMenu extends MenuController
                     } else if (event.getAction() == MotionEvent.ACTION_UP) {
                         if (System.currentTimeMillis() - startTime < CLICK_THRESHOLD) {
                             pref.setValueIndex(j);
+                            changeFilterModeControlIcon(pref.getValue());
                             onSettingChanged(pref);
                             for (View v1 : views) {
                                 v1.setBackground(null);
@@ -1212,6 +1217,22 @@ public class PhotoMenu extends MenuController
         mPreviewMenu = basic;
     }
 
+    private void changeFilterModeControlIcon(String value) {
+        if(!value.equals("")) {
+            if(value.equalsIgnoreCase(mActivity.getString(R.string.pref_camera_coloreffect_entry_none))) {
+                value = mActivity.getString(R.string.pref_camera_filter_mode_entry_off);
+            } else {
+                value = mActivity.getString(R.string.pref_camera_filter_mode_entry_on);
+            }
+            final IconListPreference pref = (IconListPreference) mPreferenceGroup
+                    .findPreference(CameraSettings.KEY_FILTER_MODE);
+            pref.setValue(value);
+            int index = pref.getCurrentIndex();
+            ImageView iv = (ImageView) mFilterModeSwitcher;
+            iv.setImageResource(((IconListPreference) pref).getLargeIconIds()[index]);
+        }
+    }
+
     public void openFirstLevel() {
         if (isMenuBeingShown() || CameraControls.isAnimating()) {
             return;