summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/FocusManager.java
Commit message (Collapse)AuthorAgeFilesLines
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-041-2/+2
| | | | | | | The SDK needs a camera app that does not require GPU acceleration. The Camera app from 4.0.4 meets these requirements. Change-Id: Idb42d4b9e47d584ef1da10e3ba672d537c8db94b
* Update camera sound API.Wu-cheng Li2011-11-181-2/+2
| | | | | bug:5640219 Change-Id: Ic3af6527f3025ec04ba4be16b621b462f89953f1
* Merge "Switch sound playing to use Camera.playSound()" into ics-mr1Eino-Ville Talvala2011-11-151-16/+5
|\
| * Switch sound playing to use Camera.playSound()Eino-Ville Talvala2011-11-081-16/+5
| | | | | | | | | | | | | | | | | | Instead of using a few private APIs to properly manage audio output for panorama, effects recording, and focus notification, use the new Camera API for sound playback. Bug: 5447107 Change-Id: I7d5a3d9502f36c199ea75a89e2c6b878185f880f
* | Do not reset the focus if next snapshot is pending.Wu-cheng Li2011-11-101-0/+4
|/ | | | | | | | | | + Suupose autofocus is focusing and a picture will be taken when focus callback arrives. Remeber the next snapshot request if the shutter button is clicked. bug:5589632 Change-Id: Ice8df7145f68996bd307fa5914e1c672bc624239
* am 4d55f6cb: Merge "Remove long pressing shutter triggers autocous." into ↵Chih-Chung Chang2011-11-011-22/+1
|\ | | | | | | | | | | | | ics-mr0 * commit '4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89': Remove long pressing shutter triggers autocous.
| * Remove long pressing shutter triggers autocous.Wu-cheng Li2011-10-281-22/+1
| | | | | | | | | | | | | | | | | | | | autoFocus behavior has changed in CAF. The focus callback will not return immediately if CAF is scanning. There is no need to have long pressing behavior. bug:5514415 Change-Id: Iacf14fa3ad48b03c79122296a74e7511c41ea62f
* | Fix 5310099: Accept an array of default values for ListPreference.Chih-Chung Chang2011-10-281-5/+17
|/ | | | | | | | The reason we want an array of default values is some of them may be unsupported on a hardware platform. The first supported value in the array will be used as the default value. Change-Id: I9e372304ec0eaea3181cf70c352a50b82d4b8c58
* Fix focus area in front camera.Chih-yu Huang2011-10-211-17/+23
| | | | | | | | | | Front camera preview is mirrored. Change to use matrix to calculate the focus area. So the focus area will be correct in all orientations in front or back camera. bug:5446617 bug:5461028 Change-Id: I2d39a22cd9f034c5028843ca3d4abe0f9962f18a
* Fix AE and AWB lock were incorrectly unlocked during autofocus.Wu-cheng Li2011-10-201-22/+52
| | | | | | | | | The only actual difference of this patch is not to unlock AE and AWB when the state is STATE_FOCUSING_SNAP_ON_FINISH. bug:5483130 Change-Id: If5108ef3c3677ebed96a291a505408ebfdc4668e
* Implemented full scan AF followed by capture on long pressing the shutter ↵heech.park2011-10-131-1/+22
| | | | | | | | | | | | | | | | button. 1. In CAF, do full scan AF followed by capture on long pressing the shutter button. 2. Capture is triggered only if long press is released on the button. bug:5447399 Change-Id: I9c7d75d76074e2e20d1f1926388315cec2c22eed Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com> Signed-off-by: Sam Braganza <sam.braganza@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com>
* Remember the snapshot request when the previous one is still in progress.Chih-Chung Chang2011-10-071-1/+5
| | | | Change-Id: I6916f775c1143a87c326e5450dfbdaf3008bc3b7
* Change focus sound.Wu-cheng Li2011-10-061-18/+11
| | | | | | bug:5401870 Change-Id: Ifb5c61ad52489c0b8fb711ba6ada624f20f0e880
* Always show gray focus indicator in continuous autofocus mode.Wu-cheng Li2011-10-051-5/+16
| | | | | | | | | | | + Do not play focus sound in CAF. Now CAF does not do a full scan. It returns failure most of the time. It is strange to show red indicator. bug:5219431 Change-Id: Ie914180e7132f29c8365dcccf810a7787bbf0d54
* Use smaller focus area and larger metering area.Chih-yu Huang2011-09-301-21/+37
| | | | | | | Change the length of focusIndicator to 1/4 of height. bug:5371513 Change-Id: I1a242b9caec9c59c4d6ce2cd70fcf6d4e55dcfc9
* Fix AF failure when shutter and tap focus are triggered at the same time.Wu-cheng Li2011-09-131-3/+2
| | | | | | | | | | | | | When the shutter button and the viewfinder are tapped simultaneously. (1) onTouch ACTION_DOWN. Tap area is set and AF is not started yet. (2) Shutter doFocus. AF starts. (3) onTouch ACTION_UP. AF is called again and an exception is thrown. Now onTouch always cancelAutoFocus if AF is in progress and the state is not STATE_FOCUSING_SNAP_ON_FINISH. bug:5265128 Change-Id: Ib52dcc5169132dde2b688062d812d59e0d7c2d7c
* Do not trigger another aufocous if CAF returns failure.Wu-cheng Li2011-09-081-11/+3
| | | | | | | | | It was decided CAF will do a full-scan automatically if the scene is not focused. The app does not need to call autofocus again. bug:5265061 Change-Id: Id16444a89c9a64ddd0df0c6817ae3dc0df4f652b
* Update focus rectangle assets.Wu-cheng Li2011-09-011-31/+30
| | | | | bug:5223866 Change-Id: I9e938953dd552da784fdea067a9b2b3859e579dd
* Rotate the focus rectangle in different orientations.Wu-cheng Li2011-08-301-9/+11
| | | | | | | | The new focus assets look different in portrait and landscape. Rotate the drawable so the orientation looks correct. bug:5223866 Change-Id: I5e5ebbcbaca95b118e051fbf6131c1a12584b2f2
* Reset the touch AF before calling cancelAutoFocusSundar Raman2011-08-251-1/+5
| | | | | | | | | If touch AF is reset after cancelAutoFocus then the AF mode stays at auto and also the touch region passed to the driver doesnt get reset. Change-Id: I6bc4241c1fde104e41315e065aaa70489cc7a197 Signed-off-by: Sundar Raman <sunds@ti.com>
* Fix NPE in FocusManager.Wu-cheng Li2011-08-251-4/+13
| | | | | | bug:5210804 Change-Id: I39143a3c45d27db6dc2669e3a249945aafddc3c4
* Refactor all focus code to a separate class.Wu-cheng Li2011-08-231-0/+423
The code about focus is complicated and scattered around. Move the code to a new class, so it is easier to maintain. Change-Id: I0214b405bf1596d967e7d89cdb04328322c6ab95