am 454c6838: Remove metering mode support.

Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda'

* commit '454c6838bb220142d05fbd6f1858ba31cc034eda':
  Remove metering mode support.

3 files changed, 1 insertions, 17 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 07adcee..3621527 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1832,14 +1832,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
         } else {
             mFocusMode = mParameters.getFocusMode();
         }
-
-        // Set metering mode parameter.
-        String meteringMode = mPreferences.getString(
-                CameraSettings.KEY_METERING_MODE,
-                getString(R.string.pref_camera_meteringmode_default));
-        if (isSupported(meteringMode, mParameters.getSupportedMeteringModes())) {
-            mParameters.setMeteringMode(meteringMode);
-        }
     }
 
     // We separate the parameters into several subsets, so we can update only
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index a97c5f2..d718b45 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -49,7 +49,6 @@ public class CameraSettings {
     public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
     public static final String KEY_QUICK_CAPTURE = "pref_camera_quickcapture_key";
     public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
-    public static final String KEY_METERING_MODE = "pref_camera_meteringmode_key";
     public static final String KEY_CAMERA_ID = "pref_camera_id";
 
     public static final String QUICK_CAPTURE_ON = "on";
@@ -155,8 +154,6 @@ public class CameraSettings {
         ListPreference exposure = group.findPreference(KEY_EXPOSURE);
         ListPreference videoFlashMode =
                 group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE);
-        ListPreference meteringMode =
-                group.findPreference(KEY_METERING_MODE);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
@@ -204,10 +201,6 @@ public class CameraSettings {
             filterUnsupportedOptions(group,
                     videoFlashMode, mParameters.getSupportedFlashModes());
         }
-        if (meteringMode != null) {
-            filterUnsupportedOptions(group,
-                    meteringMode, mParameters.getSupportedMeteringModes());
-        }
 
         if (exposure != null) {
             buildExposureCompensation(group, exposure);
diff --git a/src/com/android/camera/ui/CameraHeadUpDisplay.java b/src/com/android/camera/ui/CameraHeadUpDisplay.java
index 3b64faa..9bdb68f 100644
--- a/src/com/android/camera/ui/CameraHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CameraHeadUpDisplay.java
@@ -48,8 +48,7 @@ public class CameraHeadUpDisplay extends HeadUpDisplay {
                 CameraSettings.KEY_SCENE_MODE,
                 CameraSettings.KEY_PICTURE_SIZE,
                 CameraSettings.KEY_JPEG_QUALITY,
-                CameraSettings.KEY_COLOR_EFFECT,
-                CameraSettings.KEY_METERING_MODE);
+                CameraSettings.KEY_COLOR_EFFECT);
 
         mOtherSettings = new OtherSettingsIndicator(context, prefs);
         mOtherSettings.setOnRestorePreferencesClickedRunner(new Runnable() {