summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2009-10-05 18:13:06 -0700
committerOwen Lin <owenlin@google.com>2009-10-06 17:02:03 -0700
commit12f4b9a20982fa31806385d8e76f1d6da8320739 (patch)
treeaaeab631bca7a0cde9530708085cd56e3bffcfda /src
parent28f3595372cfbff1a2e5e83bf59d8dff76e14215 (diff)
downloadLegacyCamera-12f4b9a20982fa31806385d8e76f1d6da8320739.tar.gz
LegacyCamera-12f4b9a20982fa31806385d8e76f1d6da8320739.tar.bz2
LegacyCamera-12f4b9a20982fa31806385d8e76f1d6da8320739.zip
Show flash-off indicator on the view-finder.
For those devices without flash support, we will use a new mode: NO_FLASH_MODE and show no indicator on the view finder.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/Camera.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 33dfa083..45a2f9b3 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -89,6 +89,9 @@ public class Camera extends Activity implements View.OnClickListener,
private static final String TAG = "camera";
+ // This value must be as same as the item value of the string array
+ // "flash_mode" in file "res/values/arrays.xml".
+ private static final String NO_FLASH_MODE = "no_flash";
private static final int CROP_MSG = 1;
private static final int FIRST_TIME_INIT = 2;
private static final int RESTART_PREVIEW = 3;
@@ -1776,7 +1779,7 @@ public class Camera extends Activity implements View.OnClickListener,
} else {
flashMode = mParameters.getFlashMode();
if (flashMode == null) {
- flashMode = Parameters.FLASH_MODE_OFF;
+ flashMode = NO_FLASH_MODE;
}
}