summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/FocusOverlayManager.java
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: resolve touch af issue during countdownJay Wang2016-04-221-1/+1
| | | | | | | | | | Allow to cancel any on-going focus request when new touch focus request is issued. In previous implementation, the CAF was not cancelled before re-issuing new focus region, and it causes the focus to freeze. Change-Id: I51365b4d363e5d8af3eac8fb0af0d6955f86ff33 CRs-Fixed: 1007029
* SnapdragonCamera: Fix NPE in camera open if UI creation takes time.Sai Kumar Sanagavarapu2014-11-031-1/+7
| | | | | | | | | Sometimes null pointer exception is seen because open camera thread might try to access photo UI though its not created by that time, due to some timing issues. So, let focus manager initialize without photo UI and later update it when photo UI is ready. Change-Id: I7b4c344586115e45269483a614de1e91e1a6ab81
* Merge "Camera: Do cancel_af before changing focus mode"Linux Build Service Account2014-07-021-1/+0
|\
| * Camera: Do cancel_af before changing focus modeVijay kumar Tumati2014-06-191-1/+0
| | | | | | | | | | | | | | | | In repeated touch AF case, Need to first do cancel_af and then change the focus mode Change-Id: I57c3115a95aff4edc807d2eb61e83d68ea2f7216
* | Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-11/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| * 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 Carlsbad. Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0 Conflicts: src/com/android/camera/FocusOverlayManager.java
* | Camera2: Reset mTouchAFRunning to false when camera releaseliangche2014-03-201-0/+1
| | | | | | | | | | | | | | | | Reset mTouchAFRunning to false when camera release, which can avoid camera crash when mCameraDevice is null. Change-Id: I6f7ade2bca96d95cb8d33f28fe6536a7e63852ac Crs-fixed: 635678
* | Camera: Remove AF UI when faces are detected in photo uiSanthosh Kumar Thimmanna Bhattar2014-01-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | AF window does not go away when faces are detected while capturing the images.This is because AF is not cleared when faces are detected in photo ui. The fix is to clear AF window by calling AF succeed when faces are detected in photo ui. CRs-Fixed: 555139 Change-Id: If0f10296a8fa232829e80a07778f78f158a55bf5
* | Merge "Camera: Overrides the focus mode for ZSL"Linux Build Service Account2013-12-131-0/+14
|\ \
| * | Camera: Overrides the focus mode for ZSLEmilian Peev2013-12-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This modification will override the currently configured focus mode to CAF( if supported ) in case we switch to ZSL mode. In addition to that the client will not be able to change the focus mode once ZSL is active. - TouchAF will be available in ZSL mode if supported. - Moves focus option to the rest of the 3A modes. Change-Id: I4a2ab7d6013c26365cf46e7b3c5d2d0d3afd574e CRs-fixed: 522500,528835,585670
* | | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-13/+29
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Add logging to various actionsSeth Raphael2013-11-071-0/+4
| | | | | | | | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
| * Fix the mapping between preview UI and camera sensorDoris Liu2013-10-281-13/+25
| | | | | | | | | | Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
* | Camera: Fix instability during ZSL snapshotEmilian Peev2013-11-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AF(for instance touch AF) could be started during ZSL mode. Currently the application will not wait for AF callback to come before proceeding with the snapshot. This depending on timing will lead to inconsistent camera application state where an AF callback could arrive during image capture and override the current state machine allowing the client to trigger capture again. The second capture will fail causing an exception. - This patch will not let the camera application trigger snapshot when AF is still running during ZSL. Additionally it will unlock CAF after capture is done through a call to 'cancelAutoFocus()'. Change-Id: Id5ae8ff0b7c1576ac7c6221f09837929aefcea17 CRs-Fixed: 572996, 564453
* | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The longshot/burst pipeline mode uses an optimized path for triggering 'takePicture()' on each shutter callback. This should improve the shot-2-shot time. In addition to this there is also support for jpeg callbacks that only contain a jpeg file path. The callback in this case will only move the file stored by the lower layers in the correct directory. - The longshot burst pipeline can be enabled via this property: "persist.camera.longshot.enable"<-"0/1" - This change will allow longshot mode to be triggered in non-zsl mode as well. (Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b) (Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8) Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
* | Camera2: Fix compilation issuesManish Kumar2013-10-311-0/+7
| | | | | | | | | | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* | Camera: set default focus and metering areas to null.Alok Kediya2013-10-311-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, default values were not null which is not compatiable with our HAL. (cherry picked from commit d45720bbf03b699f9afd5909fedd82ee5a2e9745 ) Change-Id: Icfbd06ecfbf55acd1502a7d395a9239c9c9c2b1a Conflicts: src/com/android/camera/FocusOverlayManager.java (cherry picked from commit 98b3c247b8bd03b16d3b6f4b147425cad31684f7) (cherry picked from commit d3c5da81208bd01265950b31ef670bf153d0bdf8)
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-6/+16
|/ | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* Leave ROI not set except in tap-to-focus scenarioDoris Liu2013-10-031-2/+6
| | | | | Bug: 11005574 Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
* Make ROI size 1/8 of longer edge of the imageDoris Liu2013-09-261-2/+2
| | | | | Bug: 10863323 Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
* Increase ROI size to 1/8 of the image widthDoris Liu2013-09-251-4/+10
| | | | | Bug: 10863323 Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-6/+6
| | | | | | | | | 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
* Clean up Gallery codes.Angus Kong2013-08-091-13/+14
| | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-4/+4
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Spring cleaningMichael Kolb2013-03-111-33/+32
| | | | Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
* Fix auto-focus areasMichael Kolb2013-02-181-33/+28
| | | | | | | Use a specific focus area in continuous AF Use a smaller AF area for tap to focus Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
* Fix AF animationMichael Kolb2013-02-181-2/+5
| | | | | | Bug: 8219462 Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
* Fix inexplicable monkey NPEMichael Kolb2013-02-141-0/+1
| | | | | | Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
* Move Camera Java/Native source into Gallery2Michael Kolb2013-01-291-0/+560
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 18:56:05 +0000