summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/OnScreenIndicators.java
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-26 13:07:41 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-26 13:08:50 -0700
commit67685a78a29a0311043f38f8766a1fbbf881a599 (patch)
tree1ff925c144c552edeb6ca0a867279f47f47629da /src/com/android/camera/OnScreenIndicators.java
parentf5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2 (diff)
downloadandroid_packages_apps_Snap-67685a78a29a0311043f38f8766a1fbbf881a599.tar.gz
android_packages_apps_Snap-67685a78a29a0311043f38f8766a1fbbf881a599.tar.bz2
android_packages_apps_Snap-67685a78a29a0311043f38f8766a1fbbf881a599.zip
Add HQ icon indicator support.
Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
Diffstat (limited to 'src/com/android/camera/OnScreenIndicators.java')
-rw-r--r--src/com/android/camera/OnScreenIndicators.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java
index 1ddea1c17..ff0cecbd8 100644
--- a/src/com/android/camera/OnScreenIndicators.java
+++ b/src/com/android/camera/OnScreenIndicators.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
+import android.util.Log;
import android.view.View;
import android.widget.ImageView;
@@ -30,6 +31,8 @@ import com.android.camera2.R;
* settings in the viewfinder.
*/
public class OnScreenIndicators {
+ public static final String SCENE_MODE_HQ = "hq";
+
private final int[] mWBArray;
private final View mOnScreenIndicators;
private final ImageView mExposureIndicator;
@@ -164,13 +167,17 @@ public class OnScreenIndicators {
/**
* Set the scene indicator depending on the given scene mode.
*
- * @param value the current Parameters.SCENE_MODE_* value.
+ * @param value the current Parameters.SCENE_MODE_* value or
+ * {@link #SCENE_MODE_HQ}.
*/
public void updateSceneOnScreenIndicator(String value) {
if (mSceneIndicator == null) {
return;
}
- if ((value == null) || Parameters.SCENE_MODE_AUTO.equals(value)) {
+
+ if (SCENE_MODE_HQ.equals(value)) {
+ mSceneIndicator.setImageResource(R.drawable.ic_indicator_hq_on);
+ } else if ((value == null) || Parameters.SCENE_MODE_AUTO.equals(value)) {
mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_off);
} else if (Parameters.SCENE_MODE_HDR.equals(value)) {
mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_hdr);