diff options
| author | ztenghui <ztenghui@google.com> | 2013-10-10 16:09:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-10 16:09:22 +0000 |
| commit | d46d6f8e729b0e40878b53763387604a9193385a (patch) | |
| tree | 8bd73985de8dc54981223da2301f1e3e972f5741 /src | |
| parent | 048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf (diff) | |
| parent | 285a5be7ce327eb4c169e60ecc4a9cd8d583e65d (diff) | |
| download | android_packages_apps_Snap-d46d6f8e729b0e40878b53763387604a9193385a.tar.gz android_packages_apps_Snap-d46d6f8e729b0e40878b53763387604a9193385a.tar.bz2 android_packages_apps_Snap-d46d6f8e729b0e40878b53763387604a9193385a.zip | |
Merge "Fix flash issue" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -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 |