diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-11 14:58:33 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:33:36 -0800 |
| commit | b57349c3fc0db67c705a2ee0c4b084d627dbb6f5 (patch) | |
| tree | 79a552442d354e86dffd036c62a52385464622f6 /src/com/android/camera/PhotoModule.java | |
| parent | f886863e6d8024ef6d2c2712aa518a761fff6b9d (diff) | |
| download | android_packages_apps_Snap-b57349c3fc0db67c705a2ee0c4b084d627dbb6f5.tar.gz android_packages_apps_Snap-b57349c3fc0db67c705a2ee0c4b084d627dbb6f5.tar.bz2 android_packages_apps_Snap-b57349c3fc0db67c705a2ee0c4b084d627dbb6f5.zip | |
snap: Use reveal animation when switching modes
Change-Id: I7a4b4fe2c29426b57020e3a5102d89b62d46c241
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8085c40d6..ef9c91f54 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -530,7 +530,7 @@ public class PhotoModule } case SWITCH_TO_GCAM_MODULE: { - mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); + mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX, null); break; } @@ -1565,7 +1565,9 @@ public class PhotoModule @Override public void onAutoFocus( boolean focused, CameraProxy camera) { - if (mPaused) return; + if (mPaused || mUI.isPreviewCoverVisible()) { + return; + } mAutoFocusTime = System.currentTimeMillis() - mFocusStartTime; Log.v(TAG, "mAutoFocusTime = " + mAutoFocusTime + "ms"); @@ -1591,6 +1593,9 @@ public class PhotoModule @Override public void onAutoFocusMoving( boolean moving, CameraProxy camera) { + if (mPaused || mUI.isPreviewCoverVisible()) { + return; + } mCameraDevice.refreshParameters(); mFocusManager.setParameters(mCameraDevice.getParameters()); mFocusManager.onAutoFocusMoving(moving); |