SnapdragonCamera: Camera2 add flash, jpeg quality, white balance

Add flash, jpeg quality, and white balance setting menus to Camera2

CRs-Fixed: 989750
Change-Id: I288e1d4378c5e9f471b2b48a6c11ef434a9bac47

1 files changed, 8 insertions, 9 deletions

diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 97db3ac46..ed1020732 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -70,7 +70,7 @@ public class CaptureUI implements PieListener,
         CameraManager.CameraFaceDetectionCallback {
 
     private static final String TAG = "SnapCam_CaptureUI";
-    private boolean mMenuInitialized = false;
+    public boolean mMenuInitialized = false;
     private boolean surface1created = false;
     private boolean surface2created = false;
     private CameraActivity mActivity;
@@ -351,20 +351,19 @@ public class CaptureUI implements PieListener,
         mShutterButton.setVisibility(View.VISIBLE);
     }
 
-    public void doShutterAnimation() {
-        AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable();
-        frameAnimation.stop();
-        frameAnimation.start();
-    }
-
     // called from onResume every other time
-    public void initializeSecondTime(Camera.Parameters params) {
-        initializeZoom(params);
+    public void initializeSecondTime() {
         if (mMenu != null) {
             mMenu.reloadPreferences();
         }
     }
 
+    public void doShutterAnimation() {
+        AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable();
+        frameAnimation.stop();
+        frameAnimation.start();
+    }
+
     public void initializeZoom(Camera.Parameters params) {
         if ((params == null) || !params.isZoomSupported()
                 || (mZoomRenderer == null)) return;