Merge "Fix for Ripple on Fast Thumbnail Indicator" into ub-camera-haleakala

diff --combined src/com/android/camera/CaptureModule.java
index 01306c3,7c3ff56..5a4f874
--- 1/src/com/android/camera/CaptureModule.java
--- 2/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@@ -141,7 -141,6 +141,7 @@@ public class CaptureModule extends Came
      private boolean mHdrEnabled = false;
  
      private FocusController mFocusController;
 +    private OneCameraCharacteristics mCameraCharacteristics;
  
      /** The listener to listen events from the CaptureModuleUI. */
      private final CaptureModuleUI.CaptureModuleUIListener mUIListener =
@@@ -256,21 -255,14 +256,14 @@@
                  }
  
                  @Override
-                 public void onThumbnailProcessingBegun() {
+                 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() {
                          @Override
                          public void run() {
                              mAppController.getCameraAppUI().startCaptureIndicatorRevealAnimation(
                                      getPeekAccessibilityString());
-                         }
-                     });
-                 }
- 
-                 @Override
-                 public void onThumbnailAvailable(final Bitmap thumbnailBitmap, final int rotation) {
-                     mMainHandler.post(new Runnable() {
-                         @Override
-                         public void run() {
                              mAppController.getCameraAppUI().updateCaptureIndicatorThumbnail(
                                      thumbnailBitmap, rotation);
                          }
@@@ -359,15 -351,6 +352,15 @@@
          mMediaActionSound = new MediaActionSound();
      }
  
 +    private void updateCameraCharacteristics() {
 +        try {
 +            mCameraCharacteristics = mCameraManager.getCameraCharacteristics(mCameraFacing);
 +        } catch (OneCameraAccessException ocae) {
 +            mAppController.showErrorAndFinish(R.string.cannot_connect_camera);
 +            return;
 +        }
 +    }
 +
      @Override
      public void init(CameraActivity activity, boolean isSecureCamera, boolean isCaptureIntent) {
          Log.d(TAG, "init");
@@@ -379,7 -362,6 +372,7 @@@
          mDisplayRotation = CameraUtil.getDisplayRotation();
          mCameraFacing = getFacingFromCameraId(
                  mSettingsManager.getInteger(mAppController.getModuleScope(), Keys.KEY_CAMERA_ID));
 +        updateCameraCharacteristics();
          mUI = new CaptureModuleUI(activity, mAppController.getModuleLayoutRoot(), mUIListener);
          mAppController.setPreviewStatusListener(mPreviewStatusListener);
  
@@@ -678,7 -660,7 +671,7 @@@
  
              @Override
              public boolean isFlashSupported() {
 -                return true;
 +                return mCameraCharacteristics.isFlashSupported();
              }
          };
      }
@@@ -1002,7 -984,6 +995,7 @@@
  
                      Log.d(TAG, "Start to switch camera. cameraId=" + cameraId);
                      mCameraFacing = getFacingFromCameraId(cameraId);
 +                    updateCameraCharacteristics();
                      switchCamera();
                  }
              };
@@@ -1182,7 -1163,13 +1175,7 @@@
          } catch (InterruptedException e) {
              throw new RuntimeException("Interrupted while waiting to acquire camera-open lock.", e);
          }
 -        OneCameraCharacteristics cameraCharacteristics;
 -        try {
 -            cameraCharacteristics = mCameraManager.getCameraCharacteristics(mCameraFacing);
 -        } catch (OneCameraAccessException ocae) {
 -            mAppController.showErrorAndFinish(R.string.cannot_connect_camera);
 -            return;
 -        }
 +
          if (mCameraManager == null) {
              Log.e(TAG, "no available OneCameraManager, showing error dialog");
              mCameraOpenCloseLock.release();
@@@ -1199,7 -1186,7 +1192,7 @@@
          // Derive objects necessary for camera creation.
          MainThread mainThread = MainThread.create();
          ImageRotationCalculator imageRotationCalculator = ImageRotationCalculatorImpl
 -                .from(cameraCharacteristics);
 +                .from(mCameraCharacteristics);
  
          // Only enable HDR on the back camera
          boolean useHdr = mHdrEnabled && mCameraFacing == Facing.BACK;