diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-24 10:42:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-24 10:42:35 -0700 |
| commit | e99e09065329b0a7a331ffc68b5b543809b653c9 (patch) | |
| tree | d10baa3aa09d73d40f8c76a11372499b06a4a374 /src/com/android/camera/CaptureModule.java | |
| parent | a27f5779a51b581e60bd36b4af4ce5e32a005a3c (diff) | |
| parent | d72bad4bf46a1cbc49ff1685aac8a3c58c4d7546 (diff) | |
| download | android_packages_apps_Snap-e99e09065329b0a7a331ffc68b5b543809b653c9.tar.gz android_packages_apps_Snap-e99e09065329b0a7a331ffc68b5b543809b653c9.tar.bz2 android_packages_apps_Snap-e99e09065329b0a7a331ffc68b5b543809b653c9.zip | |
Merge "SnapdragonCamera: FR40621 ClearSight/DDM integrate ClearSight/DDM, integrate Clear Sight in Camera Framework" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index c225160b7..c4f56f2a6 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -76,6 +76,7 @@ import android.provider.MediaStore; import android.util.Log; import android.util.Range; import android.util.Size; +import android.view.Gravity; import android.view.KeyEvent; import android.view.OrientationEventListener; import android.view.Surface; @@ -4684,6 +4685,7 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onClearSightSuccess(byte[] thumbnailBytes) { Log.d(TAG, "onClearSightSuccess"); + onReleaseShutterLock(); if(thumbnailBytes != null) mActivity.updateThumbnail(thumbnailBytes); mActivity.runOnUiThread(new Runnable() { @Override @@ -4706,8 +4708,7 @@ public class CaptureModule implements CameraModule, PhotoController, } }); - unlockFocus(BAYER_ID); - unlockFocus(MONO_ID); + onReleaseShutterLock(); } /** @@ -4861,6 +4862,7 @@ public class CaptureModule implements CameraModule, PhotoController, private void showToast(String tips) { if (mToast == null) { mToast = Toast.makeText(mActivity, tips, Toast.LENGTH_LONG); + mToast.setGravity(Gravity.CENTER, 0, 0); } mToast.setText(tips); mToast.show(); |