diff options
| author | Owen Lin <owenlin@google.com> | 2009-10-05 18:13:06 -0700 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-10-06 17:02:03 -0700 |
| commit | 12f4b9a20982fa31806385d8e76f1d6da8320739 (patch) | |
| tree | aaeab631bca7a0cde9530708085cd56e3bffcfda | |
| parent | 28f3595372cfbff1a2e5e83bf59d8dff76e14215 (diff) | |
| download | LegacyCamera-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.
| -rw-r--r-- | res/layout/camera.xml | 2 | ||||
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/Camera.java | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 8984a0ce..b9530e65 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -80,7 +80,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/flash_icon" - camera:modes="@array/pref_camera_flashmode_entryvalues" + camera:modes="@array/flash_modes" camera:icons="@array/flash_icons" android:visibility="visible"/> </com.android.camera.EvenlySpacedLayout> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b6cb407d..026ed71d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -134,9 +134,17 @@ <item>@string/pref_camera_recordlocation_entry_on</item> </array> + <string-array name="flash_modes" translatable="false"> + <item>auto</item> + <item>on</item> + <item>off</item> + <item>no_flash</item> + </string-array> + <array name="flash_icons"> <item>@drawable/ic_viewfinder_flash_auto</item> <item>@drawable/ic_viewfinder_flash_on</item> + <item>@drawable/ic_viewfinder_flash_off</item> <item>@drawable/ic_viewfinder_empty</item> </array> 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; } } |