diff options
| author | ztenghui <ztenghui@google.com> | 2013-10-09 15:59:47 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-10-09 17:07:07 -0700 |
| commit | 285a5be7ce327eb4c169e60ecc4a9cd8d583e65d (patch) | |
| tree | 42d6c185c7476bee87d052b6178574ace5e4d493 | |
| parent | 716860487554b5e214d355f88effc9b8c316d54e (diff) | |
| download | android_packages_apps_Snap-285a5be7ce327eb4c169e60ecc4a9cd8d583e65d.tar.gz android_packages_apps_Snap-285a5be7ce327eb4c169e60ecc4a9cd8d583e65d.tar.bz2 android_packages_apps_Snap-285a5be7ce327eb4c169e60ecc4a9cd8d583e65d.zip | |
Fix flash issue
The flash light should show up at the same time as the control show up.
Also, when we change the flash mode, we should update the flash on screen
indicator.
bug:11064667
Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index f4b1ca0b7..4daf01a5a 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1706,6 +1706,7 @@ public class VideoModule implements CameraModule, } forceFlashOffIfSupported(forceOff); mCameraDevice.setParameters(mParameters); + mUI.updateOnScreenIndicators(mParameters, mPreferences); } @Override diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index d255ed7ee..7080032f4 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -662,7 +662,7 @@ public class VideoUI implements PieRenderer.PieListener, } public boolean isVisible() { - return mTextureView.getVisibility() == View.VISIBLE; + return mCameraControls.getVisibility() == View.VISIBLE; } @Override |