Merge "SnapdragonCamera: Add ProMode" into camera.lnx.1.0-dev.1.0

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 88460b865..9b224ff81 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -184,6 +184,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
     private PauseButton mPauseButton;
     private RotateImageView mMuteButton;
     private ImageView mSeekbarToggleButton;
+    private View mProModeCloseButton;
 
     int mPreviewWidth;
     int mPreviewHeight;
@@ -283,6 +284,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         });
         setMakeupButtonIcon();
         mFlashButton = (FlashToggleButton) mRootView.findViewById(R.id.flash_button);
+        mProModeCloseButton = mRootView.findViewById(R.id.promode_close_button);
+        mProModeCloseButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mSettingsManager.setValue(SettingsManager.KEY_SCENE_MODE, "" + SettingsManager.SCENE_MODE_AUTO_INT);
+            }
+        });
         initFilterModeButton();
         initSceneModeButton();
         initSwitchCamera();
@@ -425,6 +433,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         }
     }
 
+    public void initializeProMode(boolean promode) {
+        mCameraControls.setProMode(promode);
+        if (promode) mVideoButton.setVisibility(View.INVISIBLE);
+        else mVideoButton.setVisibility(View.VISIBLE);
+    }
+
     // called from onResume but only the first time
     public void initializeFirstTime() {
         // Initialize shutter button.