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 | 140c263ebb2504fe1a0212a835f0098ce7973a22 (patch) | |
| tree | e9e8ae605417b5621835eb9629b5068900d1c8a2 /src/com/android/camera/VideoUI.java | |
| parent | 95040c43501306cca22c997f3d961e32b200b134 (diff) | |
| download | android_packages_apps_Snap-140c263ebb2504fe1a0212a835f0098ce7973a22.tar.gz android_packages_apps_Snap-140c263ebb2504fe1a0212a835f0098ce7973a22.tar.bz2 android_packages_apps_Snap-140c263ebb2504fe1a0212a835f0098ce7973a22.zip | |
Fixes video mode indicators by resetting them on init.
Bug: 8696004
Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 24 |
1 files changed, 5 insertions, 19 deletions
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) { |