Camera2: Fix compilation issues

Fix compilation issues

Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21
(cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4)
(cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)

6 files changed, 130 insertions, 71 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 74877541d..243f1e35d 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1,4 +1,5 @@
-/* Copyright (C) 2009 The Android Open Source Project
+/*
+ * Copyright (C) 2009 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +65,7 @@ public class CameraSettings {
     public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key";
     public static final String KEY_CAMERA_ID = "pref_camera_id_key";
     public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key";
+    public static final String KEY_CAMERA_HQ = "pref_camera_hq_key";
     public static final String KEY_CAMERA_HDR_PLUS = "pref_camera_hdr_plus_key";
     public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key";
     public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key";
@@ -392,9 +394,8 @@ public class CameraSettings {
                 group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE);
         ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT);
         ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR);
-        ListPreference cameraHq = group.findPreference(KEY_CAMERA_HQ);
         ListPreference disMode = group.findPreference(KEY_DIS);
-
+        ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
@@ -447,7 +448,6 @@ public class CameraSettings {
                 || !CameraUtil.isCameraHdrSupported(mParameters))) {
             removePreference(group, cameraHdr.getKey());
         }
-
         int frontCameraId = CameraHolder.instance().getFrontCameraId();
         boolean isFrontCamera = (frontCameraId == mCameraId);
         if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS ||
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index d7b61043d..3176ea2b9 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -511,6 +511,13 @@ public class FocusOverlayManager {
         // Initialize mMeteringArea.
         mMeteringArea = null;
 
+        if (mFocusAreaSupported) {
+            initializeFocusAreas(mPreviewWidth / 2, mPreviewHeight / 2);
+        }
+        // Reset metering area when no specific region is selected.
+        if (mMeteringAreaSupported) {
+            resetMeteringAreas();
+        }
         mFocusDefault = true;
     }
 
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 4aeacb1f4..cc81ab8fc 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -211,7 +211,58 @@ public class PhotoMenu extends PieController
             });
             mRenderer.addItem(item);
         }
-  }
+        // Location.
+        if (group.findPreference(CameraSettings.KEY_RECORD_LOCATION) != null) {
+            item = makeSwitchItem(CameraSettings.KEY_RECORD_LOCATION, true);
+            more.addItem(item);
+            if (mActivity.isSecureCamera()) {
+                // Prevent location preference from getting changed in secure camera mode
+                item.setEnabled(false);
+            }
+        }
+        // Countdown timer.
+        final ListPreference ctpref = group.findPreference(CameraSettings.KEY_TIMER);
+        final ListPreference beeppref = group.findPreference(CameraSettings.KEY_TIMER_SOUND_EFFECTS);
+        item = makeItem(R.drawable.ic_timer);
+        item.setLabel(res.getString(R.string.pref_camera_timer_title).toUpperCase(locale));
+        item.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(PieItem item) {
+                CountdownTimerPopup timerPopup = (CountdownTimerPopup) mActivity.getLayoutInflater().inflate(
+                        R.layout.countdown_setting_popup, null, false);
+                timerPopup.initialize(ctpref, beeppref);
+                timerPopup.setSettingChangedListener(PhotoMenu.this);
+                mUI.dismissPopup();
+                mPopup = timerPopup;
+                mUI.showPopup(mPopup);
+            }
+        });
+        more.addItem(item);
+        // Image size.
+        item = makeItem(R.drawable.ic_imagesize);
+        final ListPreference sizePref = group.findPreference(CameraSettings.KEY_PICTURE_SIZE);
+        item.setLabel(res.getString(R.string.pref_camera_picturesize_title).toUpperCase(locale));
+        item.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(PieItem item) {
+                ListPrefSettingPopup popup = (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
+                        R.layout.list_pref_setting_popup, null, false);
+                popup.initialize(sizePref);
+                popup.setSettingChangedListener(PhotoMenu.this);
+                mUI.dismissPopup();
+                mPopup = popup;
+                mUI.showPopup(mPopup);
+            }
+        });
+        more.addItem(item);
+        // White balance.
+        if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
+            item = makeItem(CameraSettings.KEY_WHITE_BALANCE);
+            item.setLabel(res.getString(R.string.pref_camera_whitebalance_label));
+            more.addItem(item);
+        }
+    }
+
     @Override
     // Hit when an item in a popup gets selected
     public void onListPrefChanged(ListPreference pref) {
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index da312941e..714d64cc3 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -397,6 +397,32 @@ public class PhotoModule
                             R.string.camera_disabled);
                     break;
                 }
+               case SET_SKIN_TONE_FACTOR: {
+                    Log.v(TAG, "set tone bar: mSceneMode = " + mSceneMode);
+                    setSkinToneFactor();
+                    mSeekBarInitialized = true;
+                    // skin tone ie enabled only for party and portrait BSM
+                    // when color effects are not enabled
+                    String colorEffect = mPreferences.getString(
+                        CameraSettings.KEY_COLOR_EFFECT,
+                        mActivity.getString(R.string.pref_camera_coloreffect_default));
+                    if((Parameters.SCENE_MODE_PARTY.equals(mSceneMode) ||
+                        Parameters.SCENE_MODE_PORTRAIT.equals(mSceneMode))&&
+                        (Parameters.EFFECT_NONE.equals(colorEffect))) {
+                        ;
+                    }
+                    else{
+                        Log.v(TAG, "Skin tone bar: disable");
+                        disableSkinToneSeekBar();
+                    }
+                    break;
+               }
+               case SET_PHOTO_UI_PARAMS: {
+                    setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE);
+                    mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup,
+                        mPreferences);
+                    break;
+               }
 
                 case SWITCH_TO_GCAM_MODULE: {
                     mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX);
@@ -413,17 +439,8 @@ public class PhotoModule
             }
         }
     }
-	private BroadcastReceiver mReceiver = null;
-	private class ShutterBroadcastReceiver extends BroadcastReceiver {
-	@Override
-	public void onReceive(Context context, Intent intent) {
-	     String action = intent.getAction();
-	     if (action.equals(CameraUtil.ACTION_CAMERA_SHUTTER_CLICK)) {
-		onShutterButtonFocus(true);
-	        onShutterButtonClick();	
-		}
-	}
-   }	
+
+
     @Override
     public void init(CameraActivity activity, View parent) {
         mActivity = activity;
@@ -951,6 +968,7 @@ public class PhotoModule
             mJpegCallbackFinishTime = now - mJpegPictureCallbackTime;
             Log.v(TAG, "mJpegCallbackFinishTime = "
                     + mJpegCallbackFinishTime + "ms");
+
             if (mReceivedSnapNum == mBurstSnapNum)
                 mJpegPictureCallbackTime = 0;
 
@@ -981,11 +999,6 @@ public class PhotoModule
         // no support
         }
 
-    private OnSeekBarChangeListener mskinToneSeekListener = new OnSeekBarChangeListener() {
-        public void onStartTrackingTouch(SeekBar bar) {
-        // no support
-        }
-
         public void onProgressChanged(SeekBar bar, int progress, boolean fromtouch) {
             int value = (progress + MIN_SCE_FACTOR) * SCE_FACTOR_STEP;
             if(progress > (MAX_SCE_FACTOR - MIN_SCE_FACTOR)/2){
@@ -2111,10 +2124,6 @@ public class PhotoModule
                 mFaceDetectionEnabled = false;
             }
         }
-        //Set Skin Tone Correction factor
-        Log.v(TAG, "set tone bar: mSceneMode = " + mSceneMode);
-        if(mSeekBarInitialized == true)
-             mHandler.sendEmptyMessage(SET_SKIN_TONE_FACTOR);
         // skin tone ie enabled only for auto,party and portrait BSM
         // when color effects are not enabled
         if((Parameters.SCENE_MODE_PARTY.equals(mSceneMode) ||
@@ -2652,51 +2661,7 @@ public class PhotoModule
     public void onPreviewFocusChanged(boolean previewFocused) {
         mUI.onPreviewFocusChanged(previewFocused);
     }
-
-    private void enableSkinToneSeekBar() {
-        int progress;
-        if(brightnessProgressBar != null)
-            brightnessProgressBar.setVisibility(View.INVISIBLE);
-        skinToneSeekBar.setMax(MAX_SCE_FACTOR-MIN_SCE_FACTOR);
-        skinToneSeekBar.setVisibility(View.VISIBLE);
-        skinToneSeekBar.requestFocus();
-        if (mskinToneValue != 0) {
-            progress = (mskinToneValue/SCE_FACTOR_STEP)-MIN_SCE_FACTOR;
-            mskinToneSeekListener.onProgressChanged(skinToneSeekBar, progress, false);
-        } else {
-            progress = (MAX_SCE_FACTOR-MIN_SCE_FACTOR)/2;
-            RightValue.setText("");
-            LeftValue.setText("");
-        }
-        skinToneSeekBar.setProgress(progress);
-        mActivity.findViewById(R.id.linear).bringToFront();
-        skinToneSeekBar.bringToFront();
-        Title.setText("Skin Tone Enhancement");
-        Title.setVisibility(View.VISIBLE);
-        RightValue.setVisibility(View.VISIBLE);
-        LeftValue.setVisibility(View.VISIBLE);
-        mSkinToneSeekBar = true;
-    }
-
-    private void disableSkinToneSeekBar() {
-        skinToneSeekBar.setVisibility(View.INVISIBLE);
-        Title.setVisibility(View.INVISIBLE);
-        RightValue.setVisibility(View.INVISIBLE);
-        LeftValue.setVisibility(View.INVISIBLE);
-        mskinToneValue = 0;
-        mSkinToneSeekBar = false;
-        Editor editor = mPreferences.edit();
-        editor.putString(CameraSettings.KEY_SKIN_TONE_ENHANCEMENT_FACTOR,
-            Integer.toString(mskinToneValue - MIN_SCE_FACTOR));
-        editor.apply();
-        if(brightnessProgressBar != null)
-             brightnessProgressBar.setVisibility(View.VISIBLE);
-}
-
-/*
- * Provide a mapping for Jpeg encoding quality levels
- * from String representation to numeric representation.
- */
+    // TODO: Delete this function after old camera code is removed
     @Override
     public void onRestorePreferencesClicked() {}
     private void setSkinToneFactor() {
@@ -2749,6 +2714,8 @@ public class PhotoModule
             LeftValue.setText("");
         }
         skinToneSeekBar.setProgress(progress);
+        mActivity.findViewById(R.id.linear).bringToFront();
+        skinToneSeekBar.bringToFront();
         Title.setText("Skin Tone Enhancement");
         Title.setVisibility(View.VISIBLE);
         RightValue.setVisibility(View.VISIBLE);
@@ -2769,8 +2736,42 @@ public class PhotoModule
         editor.apply();
         if(brightnessProgressBar != null)
              brightnessProgressBar.setVisibility(View.VISIBLE);
+}
+
+/*
+ * Provide a mapping for Jpeg encoding quality levels
+ * from String representation to numeric representation.
+ */
+    @Override
+    public boolean arePreviewControlsVisible() {
+        return mUI.arePreviewControlsVisible();
+    }
+
+    // For debugging only.
+    public void setDebugUri(Uri uri) {
+        mDebugUri = uri;
+    }
+
+    // For debugging only.
+    private void saveToDebugUri(byte[] data) {
+        if (mDebugUri != null) {
+            OutputStream outputStream = null;
+            try {
+                outputStream = mContentResolver.openOutputStream(mDebugUri);
+                outputStream.write(data);
+                outputStream.close();
+            } catch (IOException e) {
+                Log.e(TAG, "Exception while writing debug jpeg file", e);
+            } finally {
+                CameraUtil.closeSilently(outputStream);
+            }
+        }
     }
 }
+
+/* Below is no longer needed, except to get rid of compile error
+ * TODO: Remove these
+ */
 class JpegEncodingQualityMappings {
     private static final String TAG = "JpegEncodingQualityMappings";
     private static final int DEFAULT_QUALITY = 85;
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 56c2d2dd7..3d748a97b 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -512,7 +512,6 @@ public class VideoModule implements CameraModule,
         if (mOrientation != newOrientation) {
             mOrientation = newOrientation;
             Log.v(TAG, "onOrientationChanged, update parameters");
-            if (mParameters != null) {
             if ((mParameters != null) && (true == mPreviewing)){
                 setCameraParameters();
             }
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 04d56ec54..dbd078d14 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -57,6 +57,7 @@ import com.android.camera.CameraDisabledException;
 import com.android.camera.CameraHolder;
 import com.android.camera.CameraManager;
 import com.android.camera.CameraSettings;
+import com.android.camera.util.IntentHelper;
 import com.android.camera2.R;
 
 import java.io.Closeable;