diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-24 21:26:37 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-24 21:26:37 -0700 |
commit | ca880d6fdbe6b3c3b5ae775245ab7efd0ac8630a (patch) | |
tree | 125dd18091117a79f5354c961c9c478943ea31cc /src/com/android/camera/CaptureUI.java | |
parent | 2ab60d2994f2b1a8ebb7c272537711eee43acad4 (diff) | |
parent | f5b1294d4602ffa447340087fdf974e55dea3112 (diff) | |
download | android_packages_apps_Snap-ca880d6fdbe6b3c3b5ae775245ab7efd0ac8630a.tar.gz android_packages_apps_Snap-ca880d6fdbe6b3c3b5ae775245ab7efd0ac8630a.tar.bz2 android_packages_apps_Snap-ca880d6fdbe6b3c3b5ae775245ab7efd0ac8630a.zip |
Merge "remove flash icon in promode" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 0b738365c..39b2d3441 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -698,10 +698,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void initializeProMode(boolean promode) { mCameraControls.setProMode(promode); - if (promode) + if (promode) { mVideoButton.setVisibility(View.INVISIBLE); - else if (mModule.getCurrentIntentMode() == CaptureModule.INTENT_MODE_NORMAL) + mFlashButton.setVisibility(View.INVISIBLE); + } + else if (mModule.getCurrentIntentMode() == CaptureModule.INTENT_MODE_NORMAL) { mVideoButton.setVisibility(View.VISIBLE); + } } // called from onResume but only the first time |