summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-09 01:17:49 -0800
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 22:00:40 +0200
commit70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0 (patch)
tree8d0f47b3f48e10b5f7c59b5d4497dd046117eb70 /src/com/android/camera/PhotoUI.java
parentaa0ed8c3c2985f1f2efcc1d40717c18f509cfb5c (diff)
downloadandroid_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.tar.gz
android_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.tar.bz2
android_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.zip
snap: Better capture animation
* Modified version from Camera2 * Also adjust the callbacks for better response Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r--src/com/android/camera/PhotoUI.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 5aeccac8f..38c6497b6 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -83,7 +83,6 @@ public class PhotoUI extends BaseUI implements PieListener,
private static final String TAG = "CAM_UI";
private int mDownSampleFactor = 4;
- private final AnimationManager mAnimationManager;
private final FocusRing mFocusRing;
private PhotoController mController;
private PreviewGestures mGestures;
@@ -126,7 +125,6 @@ public class PhotoUI extends BaseUI implements PieListener,
private float mSurfaceTextureUncroppedHeight;
private ImageView mThumbnail;
- private View mFlashOverlay;
private SurfaceTextureSizeChangedListener mSurfaceTextureSizeListener;
private SurfaceView mSurfaceView = null;
@@ -251,7 +249,6 @@ public class PhotoUI extends BaseUI implements PieListener,
});
mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay);
- mFlashOverlay = mRootView.findViewById(R.id.flash_overlay);
mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button);
mMenuButton = mRootView.findViewById(R.id.menu);
@@ -266,7 +263,6 @@ public class PhotoUI extends BaseUI implements PieListener,
}
mFocusRing = (FocusRing) mRootView.findViewById(R.id.focus_ring);
initIndicators();
- mAnimationManager = new AnimationManager();
mOrientationResize = false;
mPrevOrientationResize = false;
@@ -435,6 +431,8 @@ public class PhotoUI extends BaseUI implements PieListener,
RectF r = new RectF(mSurfaceView.getLeft(), mSurfaceView.getTop(),
mSurfaceView.getRight(), mSurfaceView.getBottom());
mController.onPreviewRectChanged(CameraUtil.rectFToRect(r));
+
+ onPreviewRectChanged(r);
}
@Override
@@ -672,10 +670,6 @@ public class PhotoUI extends BaseUI implements PieListener,
public void setCameraState(int state) {
}
- public void animateFlash() {
- mAnimationManager.startFlashAnimation(mFlashOverlay);
- }
-
public void enableGestures(boolean enable) {
if (mGestures != null) {
mGestures.setEnabled(enable);