summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/OnScreenIndicators.java
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-04-23 09:58:51 -0700
committerSascha Haeberling <haeberling@google.com>2013-04-23 10:00:33 -0700
commitae52b3e3f0f356e1b91e883729d0d82cb40d7a42 (patch)
tree1b3a7bee5a35b039fac575233f55dcb20bd1a52c /src/com/android/camera/OnScreenIndicators.java
parent86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5 (diff)
downloadandroid_packages_apps_Gallery2-ae52b3e3f0f356e1b91e883729d0d82cb40d7a42.tar.gz
android_packages_apps_Gallery2-ae52b3e3f0f356e1b91e883729d0d82cb40d7a42.tar.bz2
android_packages_apps_Gallery2-ae52b3e3f0f356e1b91e883729d0d82cb40d7a42.zip
Fixes video mode indicators by resetting them on init.
Bug: 8696004 Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
Diffstat (limited to 'src/com/android/camera/OnScreenIndicators.java')
-rw-r--r--src/com/android/camera/OnScreenIndicators.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java
index 478c25019..6c3819a3d 100644
--- a/src/com/android/camera/OnScreenIndicators.java
+++ b/src/com/android/camera/OnScreenIndicators.java
@@ -116,7 +116,8 @@ public class OnScreenIndicators {
} else {
if (Parameters.FLASH_MODE_AUTO.equals(value)) {
mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_auto);
- } else if (Parameters.FLASH_MODE_ON.equals(value)) {
+ } else if (Parameters.FLASH_MODE_ON.equals(value)
+ || Parameters.FLASH_MODE_TORCH.equals(value)) {
mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_on);
} else {
mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_off);