diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-13 14:41:10 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-08-13 16:00:58 -0700 |
commit | ddef7798808fb8871650a5a803aec1f169a08bcb (patch) | |
tree | 36b0616bbd20500cdeeb5d86239bfb65c6b35561 /src/com/android/camera/PhotoModule.java | |
parent | 02ed1b27b8cd2d0493ed18aea1ce304b6837ef64 (diff) | |
download | android_packages_apps_Snap-ddef7798808fb8871650a5a803aec1f169a08bcb.tar.gz android_packages_apps_Snap-ddef7798808fb8871650a5a803aec1f169a08bcb.tar.bz2 android_packages_apps_Snap-ddef7798808fb8871650a5a803aec1f169a08bcb.zip |
Clean up unused code.
Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 25 |
1 files changed, 1 insertions, 24 deletions
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(); |