summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/FocusOverlayManager.java
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Only autofocus before a snap if we are actually in "auto" mode.Steve Kondik2016-12-301-3/+1
| | | | | | Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
* Fix several focus indicator edge cases.Paul Rohde2015-02-111-0/+2
| | | | | | | | | Bug: 19213609 Bug: 18949556 Bug: 19214672 Bug: 19213602 Change-Id: I0d5c5ce8b4a62f98b44f6ae02ef1ac81d1d7f178
* Move stats to new package.Andy Huibers2015-01-161-1/+1
| | | | Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
* Drop new focus indicator into Camera2.Paul Rohde2014-12-171-104/+30
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* Avoid resetting touch to focus in onPreviewStarted for N4Alan Newberger2014-12-091-1/+5
| | | | | | | | | N4 HAL stability issues seem to be exacerbated by resetting focus in onPreviewStarted. Removing this call yields OK performance for N4 and removes any repros for the known issue. Bug: 18681082 Change-Id: I7f78ad648ff55dee412abb18560276cba99ab988
* Stop activity leaksSascha Haeberling2014-10-221-5/+22
| | | | | | | | | | | | | Bug: 12805279 This CL fixes all known activity leaks that occur from our app. One leak remains that is caused by Camera Framework and is tracked under b/18077200. For details on how to find and chase these leaks down, see http://go/camera-activity-leaks Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
* In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 ↵Andy Huibers2014-09-081-0/+2
| | | | | | | | | API. Bug: 17397777 Bug: 17028594 Bug: 17391241 Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
* Simplify AF in CaptureModule and OneCameraImpl and share code in ↵Andy Huibers2014-08-291-16/+8
| | | | | | | AutoFocusHelper. Bug: 17202848 Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
* Do not show AF UI prior to snapping a picture (for state ↵Andy Huibers2014-08-281-1/+1
| | | | | | | STATE_FOCUSING_SNAP_ON_FINISH). Bug: 17312087 Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333
* Reset metering and focus areas when touch focus period ends.Andy Huibers2014-08-261-1/+4
| | | | | Bug: 17286539 Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
* In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.Andy Huibers2014-08-261-19/+35
| | | | | Bug: 17028594 Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
* Show animated AF ring UI when lens is moving in continuous autofocus.Andy Huibers2014-08-251-1/+1
| | | | | Bug: 17028594 Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
* Minor clean-up around the code base.Sascha Haeberling2014-07-291-1/+1
| | | | Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
* Ensure default focus mode is continuous-pictureAlan Newberger2014-07-241-3/+11
| | | | | | | | | | The new Settings infrastructure created a bug where the default focus mode was 'auto', it needs to be continuous-picture. Fixing here. Also adding verbose logging to the focus manager, could be helpful in the future. Bug: 16536583 Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428
* Fix build.Andy Huibers2014-06-271-3/+3
| | | | Change-Id: I463f525e6097f8705257c5d18a88689216e40123
* resolved conflicts for merge of b0870db3 to ub-camera-glacierSascha Haeberling2014-06-261-11/+28
|\ | | | | | | Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
| * Clean-Up formatting.Sascha Haeberling2014-06-251-14/+35
| | | | | | | | Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
* | Fix merge conflict.Andy Huibers2014-06-241-0/+1
| | | | | | | | Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
* | am b7c7d9a0: Add metadata to capture and tap to focus events.Andy Huibers2014-06-241-0/+14
|\| | | | | | | | | * commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d': Add metadata to capture and tap to focus events.
| * Add metadata to capture and tap to focus events.Andy Huibers2014-06-231-0/+14
| | | | | | | | | | Bug: 15646701 Change-Id: Id290935839a81cfe86e9a503849207d828f33225
* | Migrate to use new CameraSettings.Angus Kong2014-06-191-42/+37
| | | | | | | | | | | | Totally get rid of Camera.Parameters. Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
* | New Settings APIErin Dahlgren2014-06-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on discussions from last week and comments on the design doc, this api begins to implement the following: 1. Adds a "Scope" variable to api, which tells the SettingsManager whether the setting can be stored globally (so that it is visible to all parts of the app), or per-camera, or per-module, or per- custom scope that the api user provides. 2. Separates keys and default values from SettingsManager, to make it easy to add new settings/defaults from third party modules. 3. Stores all settings as strings, to avoid upgrade errors, and handles casting to type requested. Only String, Integer, and boolean are supported. 4. Opens SharedPreferences files on demand, depending on scope argument. 5. Creates a "DefaultsStore" to hold the defaults and possible values of a setting. Then a user can request the default or possible values of a setting at any time. Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
* | Remove cameradevice subpackage and point references at ex librarySol Boucher2014-06-181-2/+2
|/ | | | | | This code is being relocated into frameworks/ex for availability to other apps. Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
* MotionManager for motion-aware focus unlock in Camera2. Second revision.Kevin Gabayan2014-06-171-3/+16
| | | | | | Bug: 14222601 Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
* Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"Kevin Gabayan2014-06-131-16/+4
| | | | | | This reverts commit ebba3288da5628c9ea7579b63139aa7b7312e137. Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
* MotionManager for motion-aware focus unlock in Camera2Kevin Gabayan2014-06-121-4/+16
| | | | | | Bug: 14222601 Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
* First Step: CameraCapabilities intead of ParameterAngus Kong2014-05-071-8/+11
| | | | | | | | | To get rid of Camera.Parameters, we need to provide our own interfaces. Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll provide two interfaces and will just use Camera.Parameters inside of CameraManager implementations. Change-Id: I53922b6d740835412d74365374a6a0382129564e
* Logging revisions.Andy Huibers2014-04-031-2/+1
| | | | | | Bug: 13747555 Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
* Refactor UsageStatistic so it can be disabled more easily.Sascha Haeberling2014-04-011-1/+1
| | | | Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
* Use debug.Log instead of android.util.Log.Angus Kong2014-03-261-2/+2
| | | | | | | | | | | | | 1. Change to use com.android.camera.debug.Log instead of android.util.Log. 2. Add DebugCameraProxy to support more detailed debug info. 3. Add CameraErrorCallback in CameraManager. 4. Support posting to a specific handler for CameraErrorCallback. 5. Trim down some TAGs to match the framework tag length limit. 6. Remove some unused codes in CameraSettings. bug:13324870 Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
* Focus reset delay changed from 3 to 4 seconds.Kevin Gabayan2014-03-241-2/+2
| | | | | | Bug: 12826152 Change-Id: I91a0dce343035b8d39de092a7f4bb1af26a44c55
* Align the gridlines with the preview area.Angus Kong2014-03-061-2/+2
| | | | | | | | | | 1. Rename onPreviewAreaSizeChanged() to onPreviewAreaChanged() since it's passing in the real preview area and is called when the area is changed regardless of size changes. 2. GridLines.java now draws the lines based on the preview area. bug:13098715 Change-Id: Idbd2ba03cad4698689cee46d2aa04588a415fa3d
* Remove support for press and hold to focus.Angus Kong2014-02-211-30/+31
| | | | | bug:11985910 Change-Id: Ibf37468236f1483fe622ffa6adfbde71ec21673a
* Hide focus ring when auto focusing in camera and videoDoris Liu2014-02-131-3/+3
| | | | | Bug: 12467152 Change-Id: If3c44f6b424d9796a937387d48e3dfd0dd161182
* Clearcut LogsSeth Raphael2014-01-281-2/+1
| | | Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
* Move focus overlay into generic_module.Sascha Haeberling2014-01-221-10/+6
| | | | | | | | Bug: 12563457 Also cleans up the focus overlay API. Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
* Fix focus indicator slightly off center during CAFDoris Liu2014-01-151-1/+1
| | | | Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
* Add aggressive continuous auto focus to video previewDoris Liu2014-01-131-3/+2
| | | | | | | | Also added touch to focus for video preview Part II is at ag/407029 Bug: 12368866 Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
* Merge "Center preview UI in the live preview rect" into gb-ub-photos-denaliDoris Liu2014-01-061-0/+2
|\
| * Center preview UI in the live preview rectDoris Liu2014-01-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Center flash animation Center zoom animation Center focus indicator for auto focus TODO: Gcam focus indicator is not centered in the live preview Bug: 12114128 Change-Id: I5e7f79fdf6a705789d995fc3bf3570262bc8bb49
* | Clean-up TAGs and some more auto-clean-ups.Sascha Haeberling2014-01-061-1/+1
|/ | | | Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
* Part II of ag/401462Doris Liu2013-12-211-11/+1
| | | | Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
* Touch to focusDoris Liu2013-12-201-1/+11
| | | | Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
* Add a capture-session API to be used by all modules.Sascha Haeberling2013-12-111-13/+13
| | | | | | | | | | | | | | Bug: 11747284 This refactors the way we think of sessions. Instead of having multiple session and notification APIs being used by different modules, we create on central capture session API to be used by all modules. This also adds a first implementation of a Memory API which tells modules about the current memory situation. Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
* Remove photo mode dependency on preference groups.Erin Dahlgren2013-12-041-1/+0
| | | | | Bug: 11967053 Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
* Revert fixed focus area in CAF modeMichael Kolb2013-12-031-15/+7
| | | | | | | | | | | | | | Bug: 9306098 This doesn't set the faces as focus/exp areas yet, but resets the focus area to null in CAF mode to let the HAL decide focus/exp area. Cherrypick of Bryce CL into Denali. Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0 Conflicts: src/com/android/camera/FocusOverlayManager.java
* initial simple camera pruning and refactoringMarco Nelissen2013-11-271-1/+0
| | | | | | | 100% preview and new ui bottom bar bug: 11514604 Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
* Optimize Settings api.Erin Dahlgren2013-11-261-1/+1
| | | | | | | * Caches settings descriptors. * Uses a hashmap for finding setting descriptor from key. Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
* Build out the SettingsManager model.Erin Dahlgren2013-11-251-5/+7
| | | | Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
* Add logging to various actionsSeth Raphael2013-11-071-0/+4
| | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2