summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-11-30 10:12:42 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-11-30 10:12:42 -0800
commit295a581abd39860b4bc154a5be25b09e7f78f7c0 (patch)
tree47d54912ac7efe2ec48068ba601f892873f536ee /src
parentf34519dcff7eeecb2a594574030da47912f53ccc (diff)
parent18f5350f64f56553b37bed239b09275ea44b8391 (diff)
downloadandroid_packages_apps_Snap-295a581abd39860b4bc154a5be25b09e7f78f7c0.tar.gz
android_packages_apps_Snap-295a581abd39860b4bc154a5be25b09e7f78f7c0.tar.bz2
android_packages_apps_Snap-295a581abd39860b4bc154a5be25b09e7f78f7c0.zip
Merge "SnapdraongCamera:Fix flash button visibility" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 8b72d9259..85ac9e293 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -1296,7 +1296,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public void hideCameraControls(boolean hide) {
final int status = (hide) ? View.INVISIBLE : View.VISIBLE;
- if (mFlashButton != null) mFlashButton.setVisibility(status);
+ if (mFlashButton != null){
+ mFlashButton.setVisibility(status);
+ if (!hide) {
+ mFlashButton.init(false);
+ }
+ }
if (mFrontBackSwitcher != null) mFrontBackSwitcher.setVisibility(status);
if (mSceneModeSwitcher != null) mSceneModeSwitcher.setVisibility(status);
if (mFilterModeSwitcher != null) mFilterModeSwitcher.setVisibility(status);