History log of /packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
3e40e8d8a2fecd360fb7fe339ec1c6044e4a70bc 07-Nov-2012 John Reck <jreck@google.com> Animate between camera modules

Bug: 7265781

Change-Id: Id226392fc1b14ebe5374d1952c830c960c5588d1
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
d0d0e26a7de012a19420fe1640d82b9430f0a4f7 17-Oct-2012 John Reck <jreck@google.com> Fix animation orientation

Bug: 7363502

Change-Id: Ide002122f1dc61d06b6a01733ccccc54d463ba88
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
8a3640ceaab154f3a5c4c043c6f8db8afd815e6e 17-Oct-2012 John Reck <jreck@google.com> Expose the uncropped width/height for FaceView

Bug: 7366204

Change-Id: If741a8621e2f281bbb2de5def822c46eff9487ff
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
5bf0244bc2ccc8de9950baf3edd2868b5393d716 17-Oct-2012 John Reck <jreck@google.com> Remove oversizing path from CameraScreenNail

Bug: 7302956

Change-Id: I237ba0f33358f05becbf228d1e342ad069aaceac
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
40d03901adfba08db6f2f274ded7d60ff4001663 16-Oct-2012 Michael Kolb <kolby@google.com> Fix face detection circles for landscape devices

Bug: 7257939

Change-Id: If6b2227cbb289004bd959fbc6f6319f2f4261606
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
287833cbc4d2590ff058a9c55d726689105d1004 13-Oct-2012 Doris Liu <tianliu@google.com> Fix camera screen nail for swiping during capture

Bug: 7341774

Flash animation is triggered by shutter click. But in the case
where swipe happens immediately after shutter click, when draw()
is called to draw the animation, the camera is already swiped away,
which causes camera screen nail not being drawn correctly.

This CL checks for whether camera is still full screen before the
animation is drawn, and skips the animation for non-full screen
cases.

Change-Id: I98456042db4080404fd233aed66e0f5dbf8ce960
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
666e42dde58024ce0b3f68fc6344e31e68054dd6 12-Oct-2012 Doris Liu <tianliu@google.com> Fix monkey crash in CameraScreenNail.animateSlide

Bug: 7315307

We finally hunted down the fail path. Monkey has crashed the app by
1) double tap shutter button 2) immediately swipe to gallery
3) wait for the first picture taken and the second flash animation skipped
4) swipe back to camera.

This CL ignores the animateSlide() call when the flash animation was skipped.

Change-Id: I8cdcf09cd4b6573213d364f3cdf5d12426d2abd5
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
b662638bf3d3a3edde4f21d0e4cf55a3d416656e 10-Oct-2012 John Reck <jreck@google.com> Rotation "just works" if you aren't pano

Bug: 7314702
Turns out hardware camera and lightcycle both have the same
behavior requirements wrt rotation, so pretending lightcycle
isn't a panorama will "just work"

Change-Id: I460af4a7a5aa5b51cc95c05672042dff10a11dba
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
b27064eca9c488210944e31ec052745cef2b76f7 09-Oct-2012 Michael Kolb <kolby@google.com> Merge "Fix face detection circles" into gb-ub-photos-arches
41d49f0fa2c9c93869bacfd6e7f76299f482e40f 09-Oct-2012 Michael Kolb <kolby@google.com> Fix face detection circles

Bug: 7257939

Adjust to overscale size

Change-Id: Ida067ca154faac6651ab8d00ef4388f2491a76c9
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
d1dccd2ec153a8aaa66e82b387cb42bb784c5a3a 09-Oct-2012 John Reck <jreck@google.com> Only PhotoModule should use two-part animation

Bug: 7311004

Change-Id: Ic8857336d55d6ab831368819d7fa25afcad9347f
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
70d41293e9dad8be7a1f2c556ff7c7334a60c8f5 08-Oct-2012 John Reck <jreck@google.com> Split flash & slide animation into two pieces

Bug: 7299092
Play the flash immediately on capture(), and delay the slide
until onPicture callback.

Change-Id: I81132a4083726381759e7c7aa949fda5f44d5765
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
6342be380a34976c828d21c2a3c172630123846a 08-Oct-2012 Michael Kolb <kolby@google.com> Start front/back animation from fullscreen

Bug: 7250391

Note: The animation itself is unchanged, the new camera animates
in from a smaller size to fullscreen.

Change-Id: I30e926bfb8f2bddb299a23318f9617652adfc30c
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
d282a28c60ca8f4ee82d519b12e8b0b057b294d4 03-Oct-2012 George Mount <mount@google.com> Blank out image capture after animation has started.

Bug 7280817

Change-Id: I192da2836b80e396317e9e9676bea660df2cf558
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
0c6cca8886e813fb533bcdbc6d738bc9f50d717b 02-Oct-2012 George Mount <mount@google.com> Ensure ScreenNail orientation matches LightCycle draw orientation.

Bug 7271538

Change-Id: I016653dd58c6c2f545a93877f48c2db318c378cd
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
a75966002946f0f83df427c55694e688a611ed54 02-Oct-2012 John Reck <jreck@google.com> Verify we are receiving a callback for the current ST

Bug: 7217305
Calling updateTexImage before the first onFrameAvailable call
will result in white being drawn. mFirstFrameArrived is supposed to
guard against this, however it didn't make sure that it is the current
SurfaceTexture that has a new frame. This can happen during the mode switching
as we might receive an onFrameAvailable for the old, recycled surface texture

Change-Id: I3f471ffff22b0c14a5cc06713329fa05e5bf3f6e
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
ac575473a88d12273f03e0abf2e624ca7cbaddbe 28-Sep-2012 Michael Kolb <kolby@google.com> Adjust capture animation to fullscreen

Bug: 7248430

Change-Id: I8e7cbd23f4e29ed9a8cf2691f7160f06c7e85c8e
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
9713c56dfe1c298ab0c2c75d324dc69395d1c809 18-Sep-2012 Michael Kolb <kolby@google.com> Enable full screen preview

Bug: 7191461

Overscale preview texture to fill screen
Minor problem with face detection indicators
will be fixed later.
Change-Id: I5a93048564d69fe05f5a7aa7d6506dec8517e8ea
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
0454f6a8dff47643a72fcdb668bd0b5100e4cec7 31-Jul-2012 Angus Kong <shkong@google.com> Use SurfaceView for MediaRecorder when API < 16.

Before API Level 16, we need to provide a SurfaceView to MediaRecorder
for preview when recording.

bug:6839752
Change-Id: I9e98e51517833b3cf92dd4ccbb8db33a80ab7288
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
c82461e017eed0c8bf73a646d782be3bb4f8d817 08-Aug-2012 Wu-cheng Li <wuchengli@google.com> Guard the usa of surface surface with TargetApi.

bug:6927809

Change-Id: Idc165ec73b734d8a8995c18484ff5a9bee1dfb59
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
3b4b59904a0f8ef2c2edf71fab593f77b31c4463 19-Jun-2012 Wu-cheng Li <wuchengli@google.com> Fix janky switch camera animation in effect recording.

There were two problems.
- When switching cameras, onFrameAvailable from the old
camera may already exist and the animation will start too
early.
- updateTexImage should be called even when the preview is
not displayed. Otherwise, the buffers will be full and
onFrameAvailable will not be called.

bug:6658107

Change-Id: Idc0c3c4a97675af965cef06d1607624e4c1c432e
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
40d99c1258ef297c18bf0857860b326d517bf4aa 30-May-2012 Wu-cheng Li <wuchengli@google.com> Fix incorrect sizes in camera switch animation.

bug:5954954
Change-Id: I869df22e650e0cdc5488b96ed624883ac8ac398f
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
76507a9fd2581694942a662a57fbdd46d7a20036 22-May-2012 Wu-cheng Li <wuchengli@google.com> Fix wrong aspect ratio in switch camera animation.

bug:6539357

Change-Id: I8bcb8634d88a27d839fa6ccae102a0d94b5119fb
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
24c1c15ef83608fd7a023fb5d8755f1747a5fef5 11-May-2012 Wu-cheng Li <wuchengli@google.com> Change camera switch animation to always zoom in.

bug:5954954

Change-Id: Ie2c2bc0c3c25a63dd0fc4b5f162b2ceff76475da
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
3edce30a390f5797fc8f92b85f2821868c70ef28 17-May-2012 Wu-cheng Li <wuchengli@google.com> Fix black screen when using camera.

bug:6511914

Change-Id: I739d6ee52c889fa3806aba95f3996ee91a289e88
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
b896ced70e759d3e58e5019128dcd4c2fa05a8ee 16-May-2012 Wu-cheng Li <wuchengli@google.com> The screen nail should only be drawn after the first frame arrives.

Otherwise, the viewfinder will be all white when camrea starts.

bug:6505295

Change-Id: I77ce12db0959d5e863874c2b0c6fe5b1ee1c92f3
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
4fabf52f7e8b2419749f5cdc03925d5f8b1c0199 03-May-2012 Angus Kong <shkong@google.com> Enable swipe UI in panorama mode.

bug:6305152
Change-Id: I1dcb62e097053a748a9a53bf643656556f5192fd
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
86b632739f4a58426955e28b509fde04ad0d7bb6 11-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Insert an image or video entry into MediaProvier earlier." into jb-dev
cd511956fe9b800b1abcc02934857f3f766e6367 10-May-2012 Chih-Chung Chang <chihchung@google.com> Insert an image or video entry into MediaProvier earlier.

So when the user switches to Gallery, it is already loaded.

Bug: 6452217
Change-Id: I975e3ac45b2313faed094803bf61a12dd251e1a6
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
d97ddcbe7e765b45e68e157af7ac0c873a165aa9 09-May-2012 Wu-cheng Li <wuchengli@google.com> Fix setParameters crash after switching camera is interrupted.

If switching camera is interrupted by pressing home, discard
the switch.

bug:6461894

Change-Id: I29d2fa57fe354acd5d8b2730b76a75f52946ae89
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
e6b26db98cf0ae511cf695c8e2573908d4c44766 04-May-2012 Wu-cheng Li <wuchengli@google.com> Add synchronization for CameraScreenNail.

CameraScreenNail methods are accessed by GL thread and main
thread. Super class SurfaceTextureScreenNail uses this to
synchronize. CameraScreenNail should use a separate lock.

bug:5954954

Change-Id: I83f1d314bca5d46f7b66a34c828eae62f54037d0
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
3ca123430e6f94afac31a882590ab950d34499c1 07-May-2012 Wu-cheng Li <wuchengli@google.com> Darken the preview as soon as switch camera icon is tapped.

- Back camera zooms out when switching from back to front.
- Separate zoom ratio of back and front cameras.

bug:5954954

Change-Id: I634f2a782f8fa59eb806b61e9615ea099da7886d
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
a8a1b3cb1482fd27d32f608fdb5e72d243373f2c 07-May-2012 Wu-cheng Li <wuchengli@google.com> Revert "Add a lock to protect mAnimState."

This reverts commit 5b17dd19b4e7b1bb55bc26672d80876590a1f4a0
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
5b17dd19b4e7b1bb55bc26672d80876590a1f4a0 04-May-2012 Wu-cheng Li <wuchengli@google.com> Add a lock to protect mAnimState.

mAnimState is accessed by GL thread and main thread.

bug:5954954
Change-Id: I443c2426cf0f68253445c327ca1d2b2fa7fe57f1
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
a1fb83c0f18518013c3b1d4ab8c0f78a7bc0710f 02-May-2012 Wu-cheng Li <wuchengli@google.com> Add animation when switching between back and front cameras.

bug:5954954

Change-Id: I3e3894276b4bea4568e832eaf9e7963182b58269
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
a039528021a46e95a21a16ce58aa22b23a7f5e2a 03-May-2012 Chih-Chung Chang <chihchung@google.com> Fix camera animation direction.

Bug: 6402581
Change-Id: Ifaa02a42be8c745fd34306b0913d78106a661a89
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
e5a7c7c22c1d8eced943a745c68f80a9e6d44eb4 25-Apr-2012 Owen Lin <owenlin@google.com> Use GLCanvas to copy texture.

Change-Id: Iea354ff277442f90dd95d6b72b608e85b99da29c
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
78b7bc5fe8e47bc422daf3b4e83cc7b241b210fd 27-Apr-2012 Chih-Chung Chang <chihchung@google.com> Assorted swipe UI fixes.

- Use new full screen callback to display camera controls.
- Use natural orientation for camera preview texture.
- Tell PhotoPage the preview frame position instead of doing transform ourselves.

Bug 6401075: Able to scroll through the gallery pics while capturing video.

Change-Id: Ibd4921c88b870bd5ff11bf26b5bd465d6a3e2c7b
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
351b7a85f40c6a2bcb5fb0e7eeb61002c376bb29 11-Apr-2012 Angus Kong <shkong@google.com> Restore capture animation.

The capture animation is re-implemented in GL.

bug:5988937

Change-Id: I27e45b04cc486d6580f1e9f63ede95bdb746fec9
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
67d66737e76e96bcf09879704e583b7456f763f2 18-Apr-2012 Chih-Chung Chang <chihchung@google.com> Rename pauseDraw() to recycle().

Change-Id: I407df9819b9975aab596bea54945433f37c49a15
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
8a79ddc5827de54a33d8fbef0e467da2266342cb 09-Apr-2012 Wu-cheng Li <wuchengli@google.com> Make aspect ratio of preview and picture the same.

- Move the preview to the center of the preview frame layout.

bug:6294992
bug:5954389

Change-Id: I47e4b81dd9f3c207025256e1f4e7b23d5f5d84dd
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
1cc3a3466c8e9f30f13b81a88d8b2f31050c599c 09-Apr-2012 Wu-cheng Li <wuchengli@google.com> Change how camera controls fade in/out when swiping.

The camera control should
- fade out as soon as the swiping starts.
- fade in as soon as the preview moves back into the original
place.

bug:5954389

Change-Id: Ib8a766251e111ffce272dfdbb45c43957a0c26e5
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java
a6b966047b6215b02c502a3f143106070abf6009 23-Mar-2012 Angus Kong <shkong@google.com> Use galley camera preview to support swipe UI.

Users can swipe to see the last captured picture/video and
the camera roll.

Known issues:
- Capture animation is disabled.
- Effect recording viewfinder is black.
- Swipe to gallery does not work in panorama yet.
- Swipe only works in one direction.
- Touch focus is disabled.
- Some widgets like priority indicators are not positioned correctly.
- Aspect ratio of preview and postview may not match.

bug:5954389

Change-Id: I5ea0459bead36169cd73dfa25717da7353f9d181
/packages/apps/Camera/src/com/android/camera/CameraScreenNail.java