diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-14 13:42:04 -0800 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:42 +0200 |
commit | fffb62e7b5bb609b7c9952f7f7fb6023a373b209 (patch) | |
tree | a3bad388d1c1d3283543cb3ddacc82451b16a70f /src/com/android/camera/PhotoUI.java | |
parent | cea317834c67c0b5804c279e89668309cc766074 (diff) | |
download | android_packages_apps_Snap-fffb62e7b5bb609b7c9952f7f7fb6023a373b209.tar.gz android_packages_apps_Snap-fffb62e7b5bb609b7c9952f7f7fb6023a373b209.tar.bz2 android_packages_apps_Snap-fffb62e7b5bb609b7c9952f7f7fb6023a373b209.zip |
snap: Improve transitions
* Synchronize animation to filmstrip with input
* More code cleanups, introduce BaseModule
* Animations are hard
Change-Id: Ie664bb2059a28b3a9f3957fb491ec28fede521e5
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index f71eb31cc..96dda6f8a 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -26,7 +26,6 @@ import android.graphics.Point; import android.graphics.RectF; import android.graphics.drawable.ColorDrawable; import android.hardware.Camera; -import android.hardware.Camera.Face; import android.os.AsyncTask; import android.preference.PreferenceManager; import android.util.Log; @@ -703,11 +702,8 @@ public class PhotoUI extends BaseUI implements PieListener, } public void onPreviewFocusChanged(boolean previewFocused) { - if (previewFocused) { - showUI(); - } else { - hideUI(true); - } + super.onPreviewFocusChanged(previewFocused); + if (mFaceView != null) { mFaceView.setBlockDraw(!previewFocused); } @@ -1165,7 +1161,7 @@ public class PhotoUI extends BaseUI implements PieListener, } @Override - public void onFaceDetection(Face[] faces, CameraManager.CameraProxy camera) { + public void onFaceDetection(Camera.Face[] faces, CameraManager.CameraProxy camera) { mFaceView.setFaces(faces); } |