diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-04-23 09:58:51 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-04-23 10:00:33 -0700 |
| commit | ae52b3e3f0f356e1b91e883729d0d82cb40d7a42 (patch) | |
| tree | 1b3a7bee5a35b039fac575233f55dcb20bd1a52c /src/com | |
| parent | 86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5 (diff) | |
| download | android_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')
| -rw-r--r-- | src/com/android/camera/OnScreenIndicators.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 24 |
2 files changed, 7 insertions, 20 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); diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 79150e9fe..874a8f22d 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -71,8 +71,7 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, private PreviewGestures mGestures; private View mMenu; private View mBlocker; - private View mOnScreenIndicators; - private ImageView mFlashIndicator; + private OnScreenIndicators mOnScreenIndicators; private RotateLayout mRecordingTimeRect; private VideoController mController; private int mZoomMax; @@ -101,8 +100,9 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, } } }); - mOnScreenIndicators = mActivity.findViewById(R.id.on_screen_indicators); - mFlashIndicator = (ImageView) mActivity.findViewById(R.id.menu_flash_indicator); + mOnScreenIndicators = new OnScreenIndicators( + mActivity.findViewById(R.id.on_screen_indicators)); + mOnScreenIndicators.resetToDefault(); if (mController.isVideoCaptureIntent()) { mActivity.hideSwitcher(); ViewGroup cameraControls = (ViewGroup) mActivity.findViewById(R.id.camera_controls); @@ -252,21 +252,7 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, } public void updateOnScreenIndicators(Parameters param) { - if (param == null) return; - String value = param.getFlashMode(); - if (mFlashIndicator == null) return; - if (value == null || Parameters.FLASH_MODE_OFF.equals(value)) { - mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_off); - } else { - if (Parameters.FLASH_MODE_AUTO.equals(value)) { - mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_auto); - } 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); - } - } + mOnScreenIndicators.updateFlashOnScreenIndicator(param.getFlashMode()); } public void setAspectRatio(double ratio) { |