diff options
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 7c6ccf8a1..718f55f97 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -71,6 +71,7 @@ import android.view.OrientationEventListener; import android.view.Surface; import android.view.SurfaceHolder; import android.view.View; +import android.view.ViewGroup; import android.widget.Toast; import com.android.camera.exif.ExifInterface; @@ -955,7 +956,7 @@ public class CaptureModule implements CameraModule, PhotoController, setCurrentMode(); mContentResolver = mActivity.getContentResolver(); - mUI = new CaptureUI(activity, this, parent); + mUI = new CaptureUI(activity, this, (ViewGroup) parent); mUI.initializeControlByIntent(); mFocusStateListener = new FocusStateListener(mUI); @@ -1171,14 +1172,6 @@ public class CaptureModule implements CameraModule, PhotoController, CaptureRequest request, TotalCaptureResult result) { Log.d(TAG, "captureStillPicture Longshot onCaptureCompleted: " + id); - if (mLongshotActive) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - mUI.doShutterAnimation(); - } - }); - } } @Override @@ -1186,14 +1179,6 @@ public class CaptureModule implements CameraModule, PhotoController, CaptureRequest request, CaptureFailure result) { Log.d(TAG, "captureStillPicture Longshot onCaptureFailed: " + id); - if (mLongshotActive) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - mUI.doShutterAnimation(); - } - }); - } } @Override @@ -1848,7 +1833,6 @@ public class CaptureModule implements CameraModule, PhotoController, initializeValues(); updatePreviewSize(); mUI.showSurfaceView(); - mUI.setSwitcherIndex(); mCameraIdList = new ArrayList<>(); if (mSound == null) { |