summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-08-27 15:39:46 -0700
committerWu-cheng Li <wuchengli@google.com>2010-08-30 13:33:53 -0700
commit7ec7b9970cc3a6311bf043e228991adf24c43523 (patch)
tree4aea84acb9fe2677227e5522b31de779c505a713 /core/java
parent681c5ff2085a08835c08b97641ebdc1b37489943 (diff)
downloadframeworks_base-7ec7b9970cc3a6311bf043e228991adf24c43523.zip
frameworks_base-7ec7b9970cc3a6311bf043e228991adf24c43523.tar.gz
frameworks_base-7ec7b9970cc3a6311bf043e228991adf24c43523.tar.bz2
Remove camera metering mode API.
Metering mode is not supported yet. Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/Camera.java55
1 files changed, 0 insertions, 55 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 21cb3a8..3cc89e5 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -993,7 +993,6 @@ public class Camera {
private static final String KEY_ZOOM_SUPPORTED = "zoom-supported";
private static final String KEY_SMOOTH_ZOOM_SUPPORTED = "smooth-zoom-supported";
private static final String KEY_FOCUS_DISTANCES = "focus-distances";
- private static final String KEY_METERING_MODE = "metering-mode";
// Parameter key suffix for supported values.
private static final String SUPPORTED_VALUES_SUFFIX = "-values";
@@ -1203,24 +1202,6 @@ public class Camera {
public static final int FOCUS_DISTANCE_FAR_INDEX = 2;
/**
- * The camera determines the exposure by giving more weight to the
- * central part of the scene.
- */
- public static final String METERING_MODE_CENTER_WEIGHTED = "center-weighted";
-
- /**
- * The camera determines the exposure by averaging the entire scene,
- * giving no weighting to any particular area.
- */
- public static final String METERING_MODE_FRAME_AVERAGE = "frame-average";
-
- /**
- * The camera determines the exposure by a very small area of the scene,
- * typically the center.
- */
- public static final String METERING_MODE_SPOT = "spot";
-
- /**
* The array index of minimum preview fps for use with {@link
* #getPreviewFpsRange(int[])} or {@link
* #getSupportedPreviewFpsRange()}.
@@ -2263,42 +2244,6 @@ public class Camera {
splitFloat(get(KEY_FOCUS_DISTANCES), output);
}
- /**
- * Gets the supported metering modes.
- *
- * @return a list of supported metering modes. null if metering mode
- * setting is not supported.
- * @see #getMeteringMode()
- */
- public List<String> getSupportedMeteringModes() {
- String str = get(KEY_METERING_MODE + SUPPORTED_VALUES_SUFFIX);
- return split(str);
- }
-
- /**
- * Gets the current metering mode, which affects how camera determines
- * exposure.
- *
- * @return current metering mode. If the camera does not support
- * metering setting, this should return null.
- * @see #METERING_MODE_CENTER_WEIGHTED
- * @see #METERING_MODE_FRAME_AVERAGE
- * @see #METERING_MODE_SPOT
- */
- public String getMeteringMode() {
- return get(KEY_METERING_MODE);
- }
-
- /**
- * Sets the metering mode.
- *
- * @param value metering mode.
- * @see #getMeteringMode()
- */
- public void setMeteringMode(String value) {
- set(KEY_METERING_MODE, value);
- }
-
// Splits a comma delimited string to an ArrayList of String.
// Return null if the passing string is null or the size is 0.
private ArrayList<String> split(String str) {