Use MainThread in CaptureModule and FocusController.

Change-Id: I9de2aa619edc3cc1d686b297776cdf8ab2a65ce7

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 7bfd445..809cd6c 100644 (file)
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -246,7 +246,7 @@ public class CaptureModule extends CameraModule implements
             new OneCamera.PictureSaverCallback() {
                 @Override
                 public void onRemoteThumbnailAvailable(final byte[] jpegImage) {
-                    mMainHandler.post(new Runnable() {
+                    mMainThread.execute(new Runnable() {
                         @Override
                         public void run() {
                             mAppController.getServices().getRemoteShutterListener()
@@ -259,7 +259,7 @@ public class CaptureModule extends CameraModule implements
                 public void onThumbnailAvailable(final Bitmap thumbnailBitmap, final int rotation) {
                     // Call ripple effect when you know that you have the bitmap
                     // then update bitmap.
-                    mMainHandler.post(new Runnable() {
+                    mMainThread.execute(new Runnable() {
                         @Override
                         public void run() {
                             mAppController.getCameraAppUI().startCaptureIndicatorRevealAnimation(
@@ -301,8 +301,8 @@ public class CaptureModule extends CameraModule implements
     /** Whether the module is paused right now. */
     private boolean mPaused;
 
-    /** Main thread handler. */
-    private Handler mMainHandler;
+    /** Main thread. */
+    private final MainThread mMainThread;
     /** Handler thread for camera-related operations. */
     private Handler mCameraHandler;
 
@@ -334,6 +334,7 @@ public class CaptureModule extends CameraModule implements
     public CaptureModule(AppController appController, boolean stickyHdr) {
         super(appController);
         mPaused = true;
+        mMainThread = MainThread.create();
         mAppController = appController;
         mContext = mAppController.getAndroidContext();
         mSettingsManager = mAppController.getSettingsManager();
@@ -364,7 +365,6 @@ public class CaptureModule extends CameraModule implements
     @Override
     public void init(CameraActivity activity, boolean isSecureCamera, boolean isCaptureIntent) {
         Log.d(TAG, "init");
-        mMainHandler = new Handler(activity.getMainLooper());
         HandlerThread thread = new HandlerThread("CaptureModule.mCameraHandler");
         thread.start();
         mCameraHandler = new Handler(thread.getLooper());
@@ -378,7 +378,7 @@ public class CaptureModule extends CameraModule implements
 
         mSoundPlayer = new SoundPlayer(mContext);
         FocusSound focusSound = new FocusSound(mSoundPlayer, R.raw.material_camera_focus);
-        mFocusController = new FocusController(mUI.getFocusRing(), focusSound, mMainHandler);
+        mFocusController = new FocusController(mUI.getFocusRing(), focusSound, mMainThread);
 
         // Set the preview texture from UI for the SurfaceTextureConsumer.
         mBurstController.setSurfaceTexture(
@@ -509,7 +509,7 @@ public class CaptureModule extends CameraModule implements
 
     @Override
     public void onQuickExpose() {
-        mMainHandler.post(new Runnable() {
+        mMainThread.execute(new Runnable() {
             @Override
             public void run() {
                 // Starts the short version of the capture animation UI.
@@ -611,8 +611,6 @@ public class CaptureModule extends CameraModule implements
         mBurstController.closeFrameDistributor();
         mSoundPlayer.unloadSound(R.raw.timer_final_second);
         mSoundPlayer.unloadSound(R.raw.timer_increment);
-        // Remove delayed resume trigger, if it hasn't been executed yet.
-        mMainHandler.removeCallbacksAndMessages(null);
     }
 
     @Override
@@ -1247,7 +1245,7 @@ public class CaptureModule extends CameraModule implements
                                         // getting ready to close the camera.
                                         mCameraOpenCloseLock.release();
                                         Log.e(TAG, "Could not set up preview.");
-                                        mMainHandler.post(new Runnable() {
+                                        mMainThread.execute(new Runnable() {
                                             @Override
                                             public void run() {
                                                 if (mCamera == null) {
@@ -1269,7 +1267,7 @@ public class CaptureModule extends CameraModule implements
                                         // since we may be blocked in pause(),
                                         // getting ready to close the camera.
                                         mCameraOpenCloseLock.release();
-                                        mMainHandler.post(new Runnable() {
+                                        mMainThread.execute(new Runnable() {
                                             @Override
                                             public void run() {
                                                 Log.d(TAG, "Ready for capture.");
@@ -1282,7 +1280,8 @@ public class CaptureModule extends CameraModule implements
                                                 // has started.
                                                 mUI.initializeZoom(mCamera.getMaxZoom());
                                                 mCamera.setFocusStateListener(CaptureModule.this);
-                                                mCamera.setReadyStateChangedListener(CaptureModule.this);
+                                                mCamera.setReadyStateChangedListener(
+                                                        CaptureModule.this);
                                             }
                                         });
                                     }

diff --git a/src/com/android/camera/ui/focus/FocusController.java b/src/com/android/camera/ui/focus/FocusController.java
index 7e9fc5e..f88e7d7 100644 (file)
--- a/src/com/android/camera/ui/focus/FocusController.java
+++ b/src/com/android/camera/ui/focus/FocusController.java
@@ -16,8 +16,7 @@
 
 package com.android.camera.ui.focus;
 
-import android.os.Handler;
-
+import com.android.camera.async.MainThread;
 import com.android.camera.debug.Log.Tag;
 import com.android.camera.one.OneCamera.FocusDistanceListener;
 
@@ -28,13 +27,13 @@ public class FocusController implements FocusDistanceListener {
     private static final Tag TAG = new Tag("FocusController");
 
     private final FocusRing mFocusRing;
-    private final Handler mHandler;
     private final FocusSound mFocusSound;
+    private final MainThread mMainThread;
 
-    public FocusController(FocusRing focusRing, FocusSound focusSound, Handler handler) {
+    public FocusController(FocusRing focusRing, FocusSound focusSound, MainThread mainThread) {
         mFocusRing = focusRing;
-        mHandler = handler;
         mFocusSound = focusSound;
+        mMainThread = mainThread;
     }
 
     /**
@@ -46,7 +45,7 @@ public class FocusController implements FocusDistanceListener {
      * @param viewY the view's y coordinate
      */
     public void showPassiveFocusAt(final int viewX, final int viewY) {
-        mHandler.post(new Runnable() {
+        mMainThread.execute(new Runnable() {
             @Override
             public void run() {
                 mFocusRing.startPassiveFocus();
@@ -64,7 +63,7 @@ public class FocusController implements FocusDistanceListener {
      * @param viewY the view's y coordinate
      */
     public void showActiveFocusAt(final int viewX, final int viewY) {
-        mHandler.post(new Runnable() {
+        mMainThread.execute(new Runnable() {
             @Override
             public void run() {
                 mFocusRing.startActiveFocus();
@@ -80,7 +79,7 @@ public class FocusController implements FocusDistanceListener {
      * Stop any currently executing focus animation.
      */
     public void clearFocusIndicator() {
-        mHandler.post(new Runnable() {
+        mMainThread.execute(new Runnable() {
             @Override
             public void run() {
                 mFocusRing.stopFocusAnimations();
@@ -90,11 +89,11 @@ public class FocusController implements FocusDistanceListener {
 
     @Override
     public void onFocusDistance(final float diopter, final boolean isActive) {
-        mHandler.post(new Runnable() {
+        mMainThread.execute(new Runnable() {
             @Override
             public void run() {
                 if (isActive || mFocusRing.isPassiveFocusRunning() ||
-                      mFocusRing.isActiveFocusRunning()) {
+                        mFocusRing.isActiveFocusRunning()) {
                     mFocusRing.setFocusDiopter(diopter);
                 }
             }