From 67685a78a29a0311043f38f8766a1fbbf881a599 Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Thu, 26 Sep 2013 13:07:41 -0700 Subject: Add HQ icon indicator support. Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca --- src/com/android/camera/OnScreenIndicators.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/OnScreenIndicators.java') 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); -- cgit v1.2.3