Merge "Disable focus, flash, white-balance in scene mode."

2 files changed, 14 insertions, 10 deletions

diff --git a/src/com/android/camera/ui/InLineSettingPicker.java b/src/com/android/camera/ui/InLineSettingPicker.java
index 11f1a78..adc0e89 100644
--- a/src/com/android/camera/ui/InLineSettingPicker.java
+++ b/src/com/android/camera/ui/InLineSettingPicker.java
@@ -151,6 +151,9 @@ public class InLineSettingPicker extends LinearLayout {
     private void updateView() {
         if (mOverrideValue == null) {
             mEntry.setText(mPreference.getEntry());
+            mNextButton.setVisibility(mIndex == 0 ? View.INVISIBLE : View.VISIBLE);
+            mPrevButton.setVisibility(mIndex == mPreference.getEntryValues().length - 1
+                    ? View.INVISIBLE : View.VISIBLE);
         } else {
             int index = mPreference.findIndexOfValue(mOverrideValue);
             if (index != -1) {
@@ -160,11 +163,9 @@ public class InLineSettingPicker extends LinearLayout {
                 Log.e(TAG, "Fail to find override value=" + mOverrideValue);
                 mPreference.print();
             }
+            mNextButton.setVisibility(View.INVISIBLE);
+            mPrevButton.setVisibility(View.INVISIBLE);
         }
-
-        mNextButton.setVisibility(mIndex == 0 ? View.INVISIBLE : View.VISIBLE);
-        mPrevButton.setVisibility(mIndex == mPreference.getEntryValues().length - 1
-                ? View.INVISIBLE : View.VISIBLE);
     }
 
     public void setSettingChangedListener(Listener listener) {
diff --git a/src/com/android/camera/ui/IndicatorWheel.java b/src/com/android/camera/ui/IndicatorWheel.java
index 7012925..7bb38a8 100644
--- a/src/com/android/camera/ui/IndicatorWheel.java
+++ b/src/com/android/camera/ui/IndicatorWheel.java
@@ -270,6 +270,7 @@ public class IndicatorWheel extends ViewGroup {
                 IndicatorButton indicator = (IndicatorButton) v;
                 if (key.equals(indicator.getKey())) {
                     indicator.overrideSettings(value);
+                    setEnabled(indicator, (value == null));
                 }
             }
         }
@@ -290,14 +291,16 @@ public class IndicatorWheel extends ViewGroup {
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
         int count = getChildCount();
+        for (int i = 1; i < count; i++) {
+            setEnabled((ImageView) getChildAt(i), enabled);
+        }
+    }
+
+    private void setEnabled(ImageView view, boolean enabled) {
         if (enabled) {
-            for (int i = 1; i < count; i++) {
-                ((ImageView) getChildAt(i)).clearColorFilter();
-            }
+            view.clearColorFilter();
         } else {
-            for (int i = 1; i < count; i++) {
-                ((ImageView) getChildAt(i)).setColorFilter(DISABLED_COLOR);
-            }
+            view.setColorFilter(DISABLED_COLOR);
         }
     }
 }