summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/ic_flash_redeye_holo_light.pngbin0 -> 2443 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_flash_redeye.pngbin0 -> 1838 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_redeye_holo_light.pngbin0 -> 1369 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_flash_redeye.pngbin0 -> 1041 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_redeye_holo_light.pngbin0 -> 2982 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_flash_redeye.pngbin0 -> 2506 bytes
-rw-r--r--res/values/arrays.xml5
-rw-r--r--res/values/cm_strings.xml3
-rw-r--r--src/com/android/camera/OnScreenIndicators.java4
9 files changed, 11 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_flash_redeye_holo_light.png b/res/drawable-hdpi/ic_flash_redeye_holo_light.png
new file mode 100644
index 0000000..619508a
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_redeye_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_redeye.png b/res/drawable-hdpi/ic_indicator_flash_redeye.png
new file mode 100644
index 0000000..a75f66f
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_flash_redeye.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_redeye_holo_light.png b/res/drawable-mdpi/ic_flash_redeye_holo_light.png
new file mode 100644
index 0000000..6062964
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_redeye_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_redeye.png b/res/drawable-mdpi/ic_indicator_flash_redeye.png
new file mode 100644
index 0000000..03eac38
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_flash_redeye.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_redeye_holo_light.png b/res/drawable-xhdpi/ic_flash_redeye_holo_light.png
new file mode 100644
index 0000000..3797c17
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_redeye_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_redeye.png b/res/drawable-xhdpi/ic_indicator_flash_redeye.png
new file mode 100644
index 0000000..ca94384
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_flash_redeye.png
Binary files differ
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b2f277e..bbc8036 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -315,30 +315,35 @@
<item>@string/pref_camera_flashmode_entry_off</item>
<item>@string/pref_camera_flashmode_entry_auto</item>
<item>@string/pref_camera_flashmode_entry_on</item>
+ <item>@string/pref_camera_flashmode_entry_redeye</item>
</string-array>
<string-array name="pref_camera_flashmode_labels" translatable="false">
<item>@string/pref_camera_flashmode_label_off</item>
<item>@string/pref_camera_flashmode_label_auto</item>
<item>@string/pref_camera_flashmode_label_on</item>
+ <item>@string/pref_camera_flashmode_label_redeye</item>
</string-array>
<string-array name="pref_camera_flashmode_entryvalues" translatable="false">
<item>off</item>
<item>auto</item>
<item>on</item>
+ <item>red-eye</item>
</string-array>
<array name="camera_flashmode_icons" translatable="false">
<item>@drawable/ic_flash_off_holo_light</item>
<item>@drawable/ic_flash_auto_holo_light</item>
<item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_redeye_holo_light</item>
</array>
<array name="camera_flashmode_largeicons" translatable="false">
<item>@drawable/ic_flash_off_holo_light</item>
<item>@drawable/ic_flash_auto_holo_light</item>
<item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_redeye_holo_light</item>
</array>
<!-- Videocamera Preferences flash mode dialog box entries -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 930db48..126e204 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -139,4 +139,7 @@
<string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
<string name="pref_camera_coloreffect_entry_cartoonize">Cartoonize</string>
+ <!-- Red eye flash mode title -->
+ <string name="pref_camera_flashmode_entry_redeye">Red eye</string>
+ <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
</resources>
diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java
index 67cbad1..9d07c49 100644
--- a/src/com/android/camera/OnScreenIndicators.java
+++ b/src/com/android/camera/OnScreenIndicators.java
@@ -149,7 +149,7 @@ public class OnScreenIndicators {
/**
* Set the flash indicator to the given value.
*
- * @param value One of Parameters.FLASH_MODE_OFF,
+ * @param value One of Parameters.FLASH_MODE_OFF, Parameters.FLASH_MODE_RED_EYE,
* Parameters.FLASH_MODE_AUTO, Parameters.FLASH_MODE_ON.
*/
public void updateFlashOnScreenIndicator(String value) {
@@ -164,6 +164,8 @@ public class OnScreenIndicators {
} else if (Parameters.FLASH_MODE_ON.equals(value)
|| Parameters.FLASH_MODE_TORCH.equals(value)) {
mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_on);
+ } else if (Parameters.FLASH_MODE_RED_EYE.equals(value)) {
+ mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_redeye);
} else {
mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_off);
}