Clean up unused code.

Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221

3 files changed, 1 insertions, 40 deletions

diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index bc824d917..ce932b04e 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -16,7 +16,6 @@
 
 package com.android.camera;
 
-import android.view.SurfaceHolder;
 import android.view.View;
 
 import com.android.camera.ShutterButton.OnShutterButtonListener;
@@ -53,8 +52,6 @@ public interface PhotoController extends OnShutterButtonListener {
 
     public void onSingleTapUp(View view, int x, int y);
 
-    public void onSurfaceCreated(SurfaceHolder holder);
-
     public void onCountDownFinished();
 
     public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight);
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 8d68320bf..52125adab 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -22,7 +22,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Formatter;
 import java.util.List;
 
 import android.annotation.TargetApi;
@@ -56,7 +55,6 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.OrientationEventListener;
-import android.view.SurfaceHolder;
 import android.view.View;
 import android.view.WindowManager;
 
@@ -170,8 +168,6 @@ public class PhotoModule
     };
 
     private final StringBuilder mBuilder = new StringBuilder();
-    private final Formatter mFormatter = new Formatter(mBuilder);
-    private final Object[] mFormatterArgs = new Object[1];
 
     /**
      * An unpublished intent flag requesting to return as soon as capturing
@@ -267,10 +263,6 @@ public class PhotoModule
             interrupt();
         }
 
-        public boolean isCanceled() {
-            return mCancelled;
-        }
-
         @Override
         public void run() {
             try {
@@ -607,20 +599,6 @@ public class PhotoModule
         keepMediaProviderInstance();
     }
 
-    @Override
-    public void onSurfaceCreated(SurfaceHolder holder) {
-        // Do not access the camera if camera start up thread is not finished.
-        if (mCameraDevice == null || mCameraStartUpThread != null)
-            return;
-
-        mCameraDevice.setPreviewDisplay(holder);
-        // This happens when onConfigurationChanged arrives, surface has been
-        // destroyed, and there is no onFullScreenChanged.
-        if (mCameraState == PREVIEW_STOPPED) {
-            setupPreview();
-        }
-    }
-
     private void showTapToFocusToastIfNeeded() {
         // Show the tap to focus toast if this is the first start.
         if (mFocusAreaSupported &&
@@ -851,7 +829,6 @@ public class PhotoModule
 
     private static class NamedImages {
         private ArrayList<NamedEntity> mQueue;
-        private boolean mStop;
         private NamedEntity mNamedEntity;
 
         public NamedImages() {
@@ -1503,7 +1480,7 @@ public class PhotoModule
         }
     }
 
-    // Only called by UI thread.
+    /** Only called by UI thread. */
     private void setupPreview() {
         mFocusManager.resetTouchFocus();
         startPreview();
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 29fa79879..ada0a606f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -49,7 +49,6 @@ import android.provider.MediaStore.Video;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.OrientationEventListener;
-import android.view.Surface;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;
@@ -177,7 +176,6 @@ public class VideoModule implements CameraModule,
     private LocationManager mLocationManager;
     private OrientationManager mOrientationManager;
 
-    private Surface mSurface;
     private int mPendingSwitchCameraId;
     private boolean mOpenCameraFail;
     private boolean mCameraDisabled;
@@ -1197,9 +1195,6 @@ public class VideoModule implements CameraModule,
         // If the mCameraDevice is null, then this activity is going to finish
         if (mCameraDevice == null) return;
 
-        boolean inLandscape = (mActivity.getResources().getConfiguration().orientation
-                == Configuration.ORIENTATION_LANDSCAPE);
-
         CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
 
         mEffectsDisplayResult = false;
@@ -1534,14 +1529,6 @@ public class VideoModule implements CameraModule,
         mUI.showTimeLapseUI(false);
     }
 
-    private void hideAlert() {
-        mUI.enableCameraControls(true);
-        mUI.hideReviewUI();
-        if (mCaptureTimeLapse) {
-            mUI.showTimeLapseUI(true);
-        }
-    }
-
     private boolean stopVideoRecording() {
         Log.v(TAG, "stopVideoRecording");
         mUI.setSwipingEnabled(true);