diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-09-16 17:09:09 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 15:54:57 -0700 |
commit | 93b6ff2adea4904e0d161fa6ac9524c6fddce502 (patch) | |
tree | 86e64cf27ef2facb832548127a1d3f7cca23405e /src/com/android/camera/CaptureUI.java | |
parent | c3a465da5ed9ba64512eda37597e96f6ab839fa8 (diff) | |
download | android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.tar.gz android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.tar.bz2 android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.zip |
SnapdragonCamera: Fix flash toggle button
Add flash auto mode to flash toggle button and show flash button
while taking video
Change-Id: Iffc81ba15b1651c45f826a835274c20f46dbb8cd
CRs-Fixed: 1066519
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 3531f06ff..ba57f5770 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -485,7 +485,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } public void initFlashButton() { - mFlashButton.init(); + mFlashButton.init(false); } public void initSceneModeButton() { @@ -524,14 +524,20 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } } - public void showRecordingUI(boolean recording) { - mFlashButton.setVisibility(recording ? View.GONE : View.VISIBLE); + public void showRecordingUI(boolean recording, boolean highspeed) { if (recording) { + if (highspeed) { + mFlashButton.setVisibility(View.GONE); + } else { + mFlashButton.init(true); + } mVideoButton.setImageResource(R.drawable.video_stop); mRecordingTimeView.setText(""); ((ViewGroup)mRootView).addView(mRecordingTimeRect); mMuteButton.setVisibility(View.VISIBLE); } else { + mFlashButton.setVisibility(View.VISIBLE); + mFlashButton.init(false); mVideoButton.setImageResource(R.drawable.video_capture); ((ViewGroup)mRootView).removeView(mRecordingTimeRect); mMuteButton.setVisibility(View.INVISIBLE); |