History log of /packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
4c7278d85c3398c97f941efb245df6e3ccde22c4 31-Jan-2015 Paul Rohde <codelogic@google.com> Fix several focus indicator edge cases.

Bug: 19213609
Bug: 18949556
Bug: 19214672
Bug: 19213602

Change-Id: I0d5c5ce8b4a62f98b44f6ae02ef1ac81d1d7f178
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
d7aab1856f58f13905b7e2705108795f6c2567a4 16-Jan-2015 Andy Huibers <andyhuibers@google.com> Move stats to new package.

Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
987ee64612e2510004fdf08536746c87234d01c1 05-Dec-2014 Paul Rohde <codelogic@google.com> Drop new focus indicator into Camera2.

* 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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
a8923a75b4c1ffa2158687221fd679b2dea60013 09-Dec-2014 Alan Newberger <alann@google.com> Avoid resetting touch to focus in onPreviewStarted for N4

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
375f9d11af33688eb0074e3828c870076cfa21b3 18-Oct-2014 Sascha Haeberling <haeberling@google.com> Stop activity leaks

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
ca3c564536f154b83e380e37382bc7b9f6049302 07-Sep-2014 Andy Huibers <andyhuibers@google.com> In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.

Bug: 17397777
Bug: 17028594
Bug: 17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b868274c9dc8d9c772ec89fb5955215cc7911087 28-Aug-2014 Andy Huibers <andyhuibers@google.com> Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
076efc0354552ee3b0845ae3b5988e755f92d5b0 28-Aug-2014 Andy Huibers <andyhuibers@google.com> Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

Bug: 17312087
Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
bd9b80b267195f78a8514847d0f02629e761a334 27-Aug-2014 Andy Huibers <andyhuibers@google.com> Reset metering and focus areas when touch focus period ends.

Bug: 17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
e2f5fdda4b19da650a7616853990624969d0f384 26-Aug-2014 Andy Huibers <andyhuibers@google.com> In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.

Bug: 17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
c0fe0b6915004303a550047e68a2124edae9fdb2 26-Aug-2014 Andy Huibers <andyhuibers@google.com> Show animated AF ring UI when lens is moving in continuous autofocus.

Bug: 17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
ee36c5f591ac181a10692b2ec2b96de5251c4abb 30-Jul-2014 Sascha Haeberling <haeberling@google.com> Minor clean-up around the code base.

Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
ec4a3fc5e87bf545fb718189b37538f1f1da68df 25-Jul-2014 Alan Newberger <alann@google.com> Ensure default focus mode is continuous-picture

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
09e134056bf85ee87855a44bfc5d8e7b055fe2e9 28-Jun-2014 Andy Huibers <andyhuibers@google.com> Fix build.

Change-Id: I463f525e6097f8705257c5d18a88689216e40123
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
4db887668a02bf3b66b8bc793bcda47c46d9948b 27-Jun-2014 Sascha Haeberling <haeberling@google.com> resolved conflicts for merge of b0870db3 to ub-camera-glacier

Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
e3f9ce2932f65ad537c550d0ff1f0c5fa4856ee7 25-Jun-2014 Sascha Haeberling <haeberling@google.com> Clean-Up formatting.

Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b7c7d9a067cd52a27cfbaf0714a2074f972d836d 19-Jun-2014 Andy Huibers <andyhuibers@google.com> Add metadata to capture and tap to focus events.

Bug: 15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b6605381f4c2d5d086cdd04c8d3972f22e525be5 24-Jun-2014 Andy Huibers <andyhuibers@google.com> Fix merge conflict.

Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
4a0042759b9521bf36dc0d8576a628f4a29b2bb5 24-Jun-2014 Andy Huibers <andyhuibers@google.com> am b7c7d9a0: Add metadata to capture and tap to focus events.

* commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
831347d9cb5c0e3f03db7aadfc89e91b231104e7 17-Jun-2014 Angus Kong <shkong@google.com> Migrate to use new CameraSettings.

Totally get rid of Camera.Parameters.

Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
6190c36db653e848f29d1caefc4fa1bb61e8a662 13-Jun-2014 Erin Dahlgren <edahlgren@google.com> New Settings API

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
5a344964cb003525727c31d295ca3a592c245606 17-Jun-2014 Sol Boucher <solb@google.com> Remove cameradevice subpackage and point references at ex library

This code is being relocated into frameworks/ex for availability to other apps.

Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
fb33336bc6f4b70b0686b5e060819d6bd41f3b6f 02-Jun-2014 Kevin Gabayan <gabayan@google.com> MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug: 14222601

Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
516c11a6885f6e524927bd369567f5bbd592f8ef 13-Jun-2014 Kevin Gabayan <gabayan@google.com> Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"

This reverts commit ebba3288da5628c9ea7579b63139aa7b7312e137.

Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
ebba3288da5628c9ea7579b63139aa7b7312e137 02-Jun-2014 Kevin Gabayan <gabayan@google.com> MotionManager for motion-aware focus unlock in Camera2
Bug: 14222601

Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
88289047ba6928e317d17f2e1d4b013693545c67 23-Apr-2014 Angus Kong <shkong@google.com> First Step: CameraCapabilities intead of Parameter

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
10c5816e1ff3d30e4c4996643ba05d63d522b81a 29-Mar-2014 Andy Huibers <andyhuibers@google.com> Logging revisions.

Bug: 13747555

Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
a83ec8a3acb174e2688f0d31f2094e1aa72a06ee 31-Mar-2014 Sascha Haeberling <haeberling@google.com> Refactor UsageStatistic so it can be disabled more easily.

Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
5596b4c902dcb685928b43678f428746ca5ffd08 12-Mar-2014 Angus Kong <shkong@google.com> Use debug.Log instead of android.util.Log.

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
d4a68ca4e34ad256cd4cd2f7b1faae234d240dfa 24-Mar-2014 Kevin Gabayan <gabayan@google.com> Focus reset delay changed from 3 to 4 seconds.
Bug: 12826152

Change-Id: I91a0dce343035b8d39de092a7f4bb1af26a44c55
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
2bacca795a1b0adb0daf515c43c48234b44bbba5 06-Mar-2014 Angus Kong <shkong@google.com> Align the gridlines with the preview area.

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
eaaf56d5ad909bf8d3eb23a2454983e7731e7644 20-Feb-2014 Angus Kong <shkong@google.com> Remove support for press and hold to focus.

bug:11985910
Change-Id: Ibf37468236f1483fe622ffa6adfbde71ec21673a
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
10a035c93e2cb3ed65f59258fa4d0aca89555bcd 13-Feb-2014 Doris Liu <tianliu@google.com> Hide focus ring when auto focusing in camera and video

Bug: 12467152
Change-Id: If3c44f6b424d9796a937387d48e3dfd0dd161182
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
5e09d01d80b64c81f21c57f1b99dd9dc1afed18d 18-Dec-2013 Seth Raphael <magicseth@google.com> Clearcut Logs

Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
e2914fddcd6d4f78d812ef818d43364d9aa469d4 18-Jan-2014 Sascha Haeberling <haeberling@google.com> Move focus overlay into generic_module.

Bug: 12563457

Also cleans up the focus overlay API.

Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
61c2b0d43a040123ff725a28038bb7cc01370ed5 16-Jan-2014 Doris Liu <tianliu@google.com> Fix focus indicator slightly off center during CAF

Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
a1ec04a9f9526418f5cb17a5afbfc48aca1e02d0 14-Jan-2014 Doris Liu <tianliu@google.com> Add aggressive continuous auto focus to video preview

Also added touch to focus for video preview
Part II is at ag/407029

Bug: 12368866
Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
de3b2d4bab3dc04e6bda1a0c8bdc1d01bd3260dc 06-Jan-2014 Doris Liu <tianliu@google.com> Merge "Center preview UI in the live preview rect" into gb-ub-photos-denali
5850115399516c9186cc0a8231eb1b554f570441 06-Jan-2014 Sascha Haeberling <haeberling@google.com> Clean-up TAGs and some more auto-clean-ups.

Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
ca4a5668c5bcda027bd896ebf17c8ef374e2ac75 03-Jan-2014 Doris Liu <tianliu@google.com> Center preview UI in the live preview rect

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
15b9961c5ca49fc6ac9d036e7a967797987e46ee 21-Dec-2013 Doris Liu <tianliu@google.com> Part II of ag/401462

Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
482de029dc20e0a577388a602985fb31c3200309 19-Dec-2013 Doris Liu <tianliu@google.com> Touch to focus

Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
a63dbb6231f06031204fe20b19a87d0440bd1661 22-Nov-2013 Sascha Haeberling <haeberling@google.com> Add a capture-session API to be used by all modules.

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
e419b1919ed54d8d94d19faec2d02e773ae7ecdb 03-Dec-2013 Erin Dahlgren <edahlgren@google.com> Remove photo mode dependency on preference groups.

Bug: 11967053
Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b05794393444ebd13bd24c2ecfb3fbd9963f688e 11-Jul-2013 Michael Kolb <kolby@google.com> Revert fixed focus area in CAF mode

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
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
0744e4ab3ec5f0270bdad33e7c477f52ba680bbd 22-Nov-2013 Marco Nelissen <marcone@google.com> initial simple camera pruning and refactoring

100% preview and new ui bottom bar

bug: 11514604
Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
635a4b8ba2b8684f95e5cb0aa35c244a06985f4c 26-Nov-2013 Erin Dahlgren <edahlgren@google.com> Optimize Settings api.

* Caches settings descriptors.
* Uses a hashmap for finding setting descriptor from key.

Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
357b7673f03d9b45d281d585cc3f4f87dc7d727b 21-Nov-2013 Erin Dahlgren <edahlgren@google.com> Build out the SettingsManager model.

Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
cbd8267ee99e457f72822e8d8187b5e6823104f8 05-Nov-2013 Seth Raphael <magicseth@google.com> Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
36ebcb11b15fb00d3a641499c0f8a16745a2fbb0 28-Oct-2013 Doris Liu <tianliu@google.com> Fix the mapping between preview UI and camera sensor

Bug: 11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
cbdd373181fdd389f02e71a8079e9aab5f11fbad 03-Oct-2013 Doris Liu <tianliu@google.com> Leave ROI not set except in tap-to-focus scenario

Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
2ba03263340639635120be467f8cabec2889aa08 26-Sep-2013 Doris Liu <tianliu@google.com> Make ROI size 1/8 of longer edge of the image

Bug: 10863323
Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b3749f2071f866c43ea5f70de219f23157097077 25-Sep-2013 Doris Liu <tianliu@google.com> Increase ROI size to 1/8 of the image width

Bug: 10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
638e6f06c877d90b907f66ea9c22b3c6b73c7384 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Clean up ApiHelper and remove unused code paths.

Bug: 10821545

As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.

Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
b50b5cbfbc0a67db6fc43373363b10381c9c61a3 09-Aug-2013 Angus Kong <shkong@google.com> Clean up Gallery codes.

bug:10263696

Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
8e963a5a6016d246184ed65906f9d103e92b17e2 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
d6954f337e20365fc24ecffdd6f30e17c6b31eff 09-Mar-2013 Michael Kolb <kolby@google.com> Spring cleaning

Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
0718d480a144ba0a44c07c48f90e85cf4ec669c6 16-Feb-2013 Michael Kolb <kolby@google.com> Fix auto-focus areas

Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus

Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
e3de7223ee3fe56e097d68f50c5a59ae61370d65 19-Feb-2013 Michael Kolb <kolby@google.com> Fix AF animation

Bug: 8219462

Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
4a40e126df5a77eaf44a52c73011cbfa91879b54 14-Feb-2013 Michael Kolb <kolby@google.com> Fix inexplicable monkey NPE

Bug: 8049510

Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java
8872c23e739de38d74f04a8c852ebb5199c905f6 29-Jan-2013 Michael Kolb <kolby@google.com> Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
/packages/apps/Camera2/src/com/android/camera/FocusOverlayManager.java