Minor clean-up around the code base.

Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d

6 files changed, 24 insertions, 16 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 309a8e1ca..d236d8a71 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -149,7 +149,7 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
         mSettingsManager = appController.getSettingsManager();
         mHandler = new MainHandler(looper);
         mMatrix = new Matrix();
-        mDefaultFocusModes = new ArrayList<>(defaultFocusModes);
+        mDefaultFocusModes = new ArrayList<CameraCapabilities.FocusMode>(defaultFocusModes);
         updateCapabilities(capabilities);
         mListener = listener;
         setMirror(mirror);
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3543c9f96..c39766b8e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -76,12 +76,12 @@ import com.android.camera.util.SessionStatsCollector;
 import com.android.camera.util.UsageStatistics;
 import com.android.camera.widget.AspectRatioSelector;
 import com.android.camera2.R;
-import com.android.ex.camera2.portability.CameraCapabilities;
 import com.android.ex.camera2.portability.CameraAgent.CameraAFCallback;
 import com.android.ex.camera2.portability.CameraAgent.CameraAFMoveCallback;
 import com.android.ex.camera2.portability.CameraAgent.CameraPictureCallback;
 import com.android.ex.camera2.portability.CameraAgent.CameraProxy;
 import com.android.ex.camera2.portability.CameraAgent.CameraShutterCallback;
+import com.android.ex.camera2.portability.CameraCapabilities;
 import com.android.ex.camera2.portability.CameraDeviceInfo.Characteristics;
 import com.android.ex.camera2.portability.CameraSettings;
 import com.android.ex.camera2.portability.Size;
@@ -1622,7 +1622,8 @@ public class PhotoModule
             mMirror = isCameraFrontFacing();
             String[] defaultFocusModesStrings = mActivity.getResources().getStringArray(
                     R.array.pref_camera_focusmode_default_array);
-            ArrayList<CameraCapabilities.FocusMode> defaultFocusModes = new ArrayList<>();
+            ArrayList<CameraCapabilities.FocusMode> defaultFocusModes =
+                    new ArrayList<CameraCapabilities.FocusMode>();
             CameraCapabilities.Stringifier stringifier = mCameraCapabilities.getStringifier();
             for (String modeString : defaultFocusModesStrings) {
                 CameraCapabilities.FocusMode mode = stringifier.focusModeFromString(modeString);
@@ -2300,7 +2301,7 @@ public class PhotoModule
             return index;
         }
         // Set zoom parameters asynchronously
-        mCameraSettings.setZoomRatio((float) mZoomValue);
+        mCameraSettings.setZoomRatio(mZoomValue);
         mCameraDevice.applySettings(mCameraSettings);
         CameraSettings settings = mCameraDevice.getSettings();
         if (settings != null) {
diff --git a/src/com/android/camera/TextureViewHelper.java b/src/com/android/camera/TextureViewHelper.java
index 3d44e272b..7974cb67b 100644
--- a/src/com/android/camera/TextureViewHelper.java
+++ b/src/com/android/camera/TextureViewHelper.java
@@ -41,7 +41,7 @@ public class TextureViewHelper implements TextureView.SurfaceTextureListener,
     private static final Log.Tag TAG = new Log.Tag("TexViewHelper");
     public static final float MATCH_SCREEN = 0f;
     private static final int UNSET = -1;
-    private TextureView mPreview;
+    private final TextureView mPreview;
     private int mWidth = 0;
     private int mHeight = 0;
     private RectF mPreviewArea = new RectF();
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 553460db1..3ba9f6b5d 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -477,7 +477,8 @@ public class VideoModule extends CameraModule
             String[] defaultFocusModesStrings = mActivity.getResources().getStringArray(
                     R.array.pref_camera_focusmode_default_array);
             CameraCapabilities.Stringifier stringifier = mCameraCapabilities.getStringifier();
-            ArrayList<CameraCapabilities.FocusMode> defaultFocusModes = new ArrayList<>();
+            ArrayList<CameraCapabilities.FocusMode> defaultFocusModes =
+                    new ArrayList<CameraCapabilities.FocusMode>();
             for (String modeString : defaultFocusModesStrings) {
                 CameraCapabilities.FocusMode mode = stringifier.focusModeFromString(modeString);
                 if (mode != null) {
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 3e220e62e..4979bce2d 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -197,7 +197,9 @@ public class CameraDataAdapter implements LocalDataAdapter {
 
     @Override
     public boolean undoDataRemoval() {
-        if (mLocalDataToDelete == null) return false;
+        if (mLocalDataToDelete == null) {
+            return false;
+        }
         LocalData d = mLocalDataToDelete;
         mLocalDataToDelete = null;
         insertData(d);
@@ -206,7 +208,9 @@ public class CameraDataAdapter implements LocalDataAdapter {
 
     @Override
     public boolean executeDeletion() {
-        if (mLocalDataToDelete == null) return false;
+        if (mLocalDataToDelete == null) {
+            return false;
+        }
 
         DeletionTask task = new DeletionTask();
         task.execute(mLocalDataToDelete);
@@ -262,7 +266,9 @@ public class CameraDataAdapter implements LocalDataAdapter {
         int pos = 0;
         Comparator<LocalData> comp = new LocalData.NewestFirstComparator();
         for (; pos < mImages.size()
-                && comp.compare(data, mImages.get(pos)) > 0; pos++);
+                && comp.compare(data, mImages.get(pos)) > 0; pos++) {
+            ;
+        }
         mImages.add(pos, data);
         if (mListener != null) {
             mListener.onDataInserted(pos, data);
@@ -421,6 +427,8 @@ public class CameraDataAdapter implements LocalDataAdapter {
             if (mDoneCallback != null) {
                 mDoneCallback.onCallback(null);
             }
+
+            android.util.Log.d("DBG>>>", "QueryTask loads new photos.");
             // Now check for any photos added since this task was kicked off
             LoadNewPhotosTask ltask = new LoadNewPhotosTask(mLastPhotoId);
             ltask.execute(mContext.getContentResolver());
diff --git a/src/com/android/camera/settings/SettingsUtil.java b/src/com/android/camera/settings/SettingsUtil.java
index 4c5ac3bdd..e46c88e0b 100644
--- a/src/com/android/camera/settings/SettingsUtil.java
+++ b/src/com/android/camera/settings/SettingsUtil.java
@@ -16,18 +16,16 @@
 
 package com.android.camera.settings;
 
-import android.content.Context;
-import android.content.res.Resources;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.hardware.Camera;
+import android.content.res.Resources;
 import android.media.CamcorderProfile;
 import android.util.SparseArray;
 
 import com.android.camera.debug.Log;
 import com.android.camera.util.Callback;
 import com.android.camera2.R;
-import com.android.ex.camera2.portability.CameraAgent;
 import com.android.ex.camera2.portability.CameraDeviceInfo;
 import com.android.ex.camera2.portability.CameraSettings;
 import com.android.ex.camera2.portability.Size;
@@ -67,7 +65,7 @@ public class SettingsUtil {
          * SIZE_SMALL as well as resolutions separated by an x i.e. "1024x576" <br/>
          * If it fails to parse the string, it will return the old SIZE_LARGE
          * value.
-         * 
+         *
          * @param sizeSetting the preference string to convert to a size
          * @param supportedSizes all possible camera sizes that are supported
          * @return the size that this setting represents
@@ -392,7 +390,7 @@ public class SettingsUtil {
 
     /**
      * This is used to serialize a size to a string for storage in settings
-     * 
+     *
      * @param size The size to serialize.
      * @return the string to be saved in preferences
      */
@@ -402,7 +400,7 @@ public class SettingsUtil {
 
     /**
      * This parses a setting string and returns the representative size.
-     * 
+     *
      * @param sizeSetting The string to parse.
      * @return the represented Size.
      */