am ff42ae0e: am b65537df: Merge change Ida3e9964 into eclair-mr2

Merge commit 'ff42ae0e23bb04e316d46571d797af43cf8f4d7d'

* commit 'ff42ae0e23bb04e316d46571d797af43cf8f4d7d':
  Add flash light setting in video camera.

4 files changed, 34 insertions, 0 deletions

diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index b6717d8..85f7f07 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -72,6 +72,11 @@
                     android:layout_height="wrap_content">
                 <com.android.camera.IconIndicator
                         style="@style/IconIndicator"
+                        android:id="@+id/flash_icon"
+                        camera:modes="@array/flash_modes"
+                        camera:icons="@array/flash_icons"/>
+                <com.android.camera.IconIndicator
+                        style="@style/IconIndicator"
                         android:id="@+id/whitebalance_icon"
                         camera:modes="@array/pref_camera_whitebalance_entryvalues"
                         camera:icons="@array/whitebalance_icons"/>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index fe07fba..d8fcec4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -126,6 +126,22 @@
         <item>@drawable/ic_viewfinder_flash_off</item>
     </array>
 
+    <!-- Videocamera Preferences flash mode dialog box entries -->
+    <string-array name="pref_camera_video_flashmode_entries" translatable="false">
+        <item>@string/pref_camera_flashmode_entry_on</item>
+        <item>@string/pref_camera_flashmode_entry_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_video_flashmode_entryvalues" translatable="false">
+        <item>torch</item>
+        <item>off</item>
+    </string-array>
+
+    <array name="pref_camera_video_flashmode_icons">
+        <item>@drawable/ic_viewfinder_flash_on</item>
+        <item>@drawable/ic_viewfinder_flash_off</item>
+    </array>
+
     <string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
         <item>off</item>
         <item>on</item>
@@ -139,6 +155,7 @@
     <string-array name="flash_modes" translatable="false">
         <item>auto</item>
         <item>on</item>
+        <item>torch</item>
         <item>off</item>
         <item>@string/pref_camera_flashmode_no_flash</item>
     </string-array>
@@ -146,6 +163,7 @@
     <array name="flash_icons">
         <item>@drawable/ic_viewfinder_flash_auto</item>
         <item>@drawable/ic_viewfinder_flash_on</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/res/values/strings.xml b/res/values/strings.xml
index de74e1e..5cd38e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -229,6 +229,9 @@
     <!-- Settings screen, flash mode dialog title -->
     <string name="pref_camera_flashmode_dialogtitle">Flash mode</string>
 
+    <!-- Default videocamera flash mode setting.-->
+    <string name="pref_camera_video_flashmode_default" translatable="false">off</string>
+
     <!-- Default white balance setting. -->
     <string name="pref_camera_whitebalance_default" translatable="false">auto</string>
 
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 105d1fc..3f8b99d 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -33,6 +33,14 @@
                 android:entryValues="@array/pref_camera_video_duration_entryvalues"
                 android:dialogTitle="@string/pref_camera_video_duration_dialogtitle" />
         <com.android.camera.IconListPreference
+                android:key="pref_camera_video_flashmode_key"
+                android:defaultValue="@string/pref_camera_video_flashmode_default"
+                android:title="@string/pref_camera_flashmode_title"
+                camera:icons="@array/pref_camera_video_flashmode_icons"
+                android:entries="@array/pref_camera_video_flashmode_entries"
+                android:entryValues="@array/pref_camera_video_flashmode_entryvalues"
+                android:dialogTitle="@string/pref_camera_flashmode_dialogtitle" />
+        <com.android.camera.IconListPreference
                 android:key="pref_camera_whitebalance_key"
                 android:defaultValue="@string/pref_camera_whitebalance_default"
                 android:title="@string/pref_camera_whitebalance_title"