summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Enhance KK cameraapp for LChiou-Hao Hsu2014-08-162-5/+5
| | | | | | Enhance KK cameraapp for L. Change-Id: If708b253f34a131d7842f8921e54c008283e0056
* Merge "Camera2: Fix show switcher after capture picture with HDR on in message"Linux Build Service Account2014-07-211-2/+1
|\
| * Camera2: Fix show switcher after capture picture with HDR on in messagekaiyiz2014-07-091-2/+1
| | | | | | | | | | | | | | | | | | | | Switcher should not be shown when open camera use CAPTURE intent. Show switcher only when mIsImaegCaptureIntent not true. CRs-Fixed: 690941 Change-Id: I41c34288adfccf3cdad7b14f552f8dd67c3106c1
* | Merge "Camera2: fix face still display after unmark the face detect option"Linux Build Service Account2014-07-212-1/+9
|\ \
| * | Camera2: fix face still display after unmark the face detect optionkaiyiz2014-07-142-1/+9
| |/ | | | | | | | | | | | | | | | | | | | | After unmark the face detect option, the value mFace in FaceView maybe reset value and draw all the time. The faces should not be draw after stopFaceDetection, so block draw the faces after stopFaceDetection and unblock after startFaceDetection. Change-Id: I2f8316e12ad8c7b157bc732800d9247c66a17572 CRs-Fixed: 692057
* | Merge "Camera2: optionally force count down sound"Linux Build Service Account2014-07-171-2/+6
|\ \
| * | Camera2: optionally force count down soundLikai Ding2014-07-091-2/+6
| |/ | | | | | | | | | | | | set count down sound as STREAM_SYSTEM_ENFORCED for carrier compliance Change-Id: Ie60bb4c7059ad8930be2c6650808107dcaaa22a2 CRs-Fixed: 684591
* / Camera: Add HSR 60 and HSR 90 modesVijay kumar Tumati2014-07-162-60/+34
|/ | | | | | | | | | | | | Adding 2 more modes 60 and 90 to HSR feature. HSR - High speed recording where video is recorded at the same fps at which camera is pumping frames. CRs-Fixed: 629713 Change-Id: I31a13f8d5db8c94be7bafb7506bafe268b764362
* Merge "Camera2: fix more settings menu use the same icon"Linux Build Service Account2014-07-082-5/+5
|\
| * Camera2: fix more settings menu use the same iconkaiyiz2014-06-302-5/+5
| | | | | | | | | | | | | | | | | | | | There is only one icon fit this menu. Add new icons for this menu item and use them in videomenu and photomenu. CRs-Fixed: 634284 Change-Id: I277bd01910fd27508e50b5b1793e9e5f58e0c70f
* | Merge "Camera2: fix white balance still work when turn on the HDR mode"Linux Build Service Account2014-07-082-4/+9
|\ \
| * | Camera2: fix white balance still work when turn on the HDR modekaiyiz2014-07-032-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on target : 8916 Tested on Branch : kk Tested on AU \ tip : AU_LINUX_ANDROID_LNX.LA.3.7.1.04.04.03.031.203 Test case Verified : Yes CR Moved to Fix : Yes R notes filled : Yes DC set : Yes LOST approved (if new file \ feature added): Yes Voted on required Trunk : NA App need clear the whitebalance effect when set scene mode not auto, but the value getWhiteBalance still is not auto when change scene mode. So set white balance auto value forcely when scene mode is not auto. CRs-Fixed: 685240 Change-Id: Ib94b9cb1f3cc0c8ef63412ef75d65359ba797f37
* | | Merge "Camera2: Add support to save Depth map for refocus"Linux Build Service Account2014-07-072-110/+134
|\ \ \
| * | | Camera2: Add support to save Depth map for refocusIvan Evlogiev2014-06-302-110/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Save the Depth map when callback by jpeg, which is bypass in jpeg encode. Change-Id: I9a4e64400b71f35d6fa6638cdfe08a6c40f0046b
* | | | Merge "Camera: Initial Refocus support"Linux Build Service Account2014-07-073-12/+85
|\| | |
| * | | Camera: Initial Refocus supportEmilian Peev2014-06-263-12/+85
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Refocus mode is enabled which expects 7 snapshots in burst from the camera. The captured images are stored with custom names. Change-Id: I7c1f9ef15d710118f7089c2fc584da450ab0984c
* | | Merge "Camera: Don't set brightness progressbar visible if not set"Linux Build Service Account2014-07-031-2/+4
|\ \ \
| * | | Camera: Don't set brightness progressbar visible if not setSuman Mukherjee2014-06-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Through skintonedisable brightnessprogressbar is getting enabled, though that hasn't got triggered. Fix Made: Use the unused brightnessvisible flag to identify whether brightness had been triggered or not. If it hasn't got triggered, then don't enable the progressbar in skintonedisable method. Change-Id: I72960fb206fb758dd4e330341f5b4f5267d97ac5 CRs-Fixed: 653129
* | | | Merge "Camera2: Fix callback with old data after camera switch"Linux Build Service Account2014-07-031-6/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2: Fix callback with old data after camera switchIvan Evlogiev2014-06-201-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix race condition for calling camera callbacks with old data after camera switch Change-Id: If63e7903f3e7821220397b1b8cea4d9478ba3c94
* | | | 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 "Revert "Camera: Mem-leak""Linux Build Service Account2014-06-307-74/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Camera: Mem-leak"Vijay kumar Tumati2014-06-197-74/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 46b761ab50e36daa2ff79527553014905e784895. We see some regressions with this change so we are reverting it for now. We will fix the issues soon. Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312
* | | | Merge "Merge tag 'android-4.4.3_r1' into HEAD"Linux Build Service Account2014-06-235-17/+29
|\ \ \ \
| * \ \ \ Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-115-17/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Remove TRIM supportAlan Newberger2013-12-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ability to trim a video with the quick menu action. Bug: 11884080 Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
| | * | | | Fix samsung video recordingMichael Kolb2013-12-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patching Bryce CL into Carlsbad Bug: 9056573 Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9 Conflicts: src/com/android/camera/VideoModule.java
| | * | | | Fix WB indicator overrideMichael Kolb2013-12-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patching into Carlsbad from Bryce. Bug: 9372794 Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
| | * | | | 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
| | * | | | Always set focus mode first before applying scene modeMichael Kolb2013-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from Bryce branch Bug: 9577903 Bug: 11777611 Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
| | * | | | Reduce logging of flattened PreferencesSeth Raphael2013-11-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
| | * | | | Delay onResume tasks to speed up lockscreenAndy Huibers2013-11-191-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onResume->onPause->onResume launch sequence. Bug: 11773268 Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
* | | | | | Merge "Camera2: Check memory status when in longshot mode"Linux Build Service Account2014-06-201-1/+54
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Camera2: Check memory status when in longshot modeFei Zhang2014-06-201-1/+54
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1> When memory can be used by application is smaller than 40MB, need cancel longshot. 2> When system memory is limited, need cancel longshot. 3> When longshot begin, also check the memory status. 4> The thresholds can be changed based on Customer requirement. CRs-fixed: 654291 Change-Id: I0d4688fe13c8c28a4fda4e9ac9c2257302201ae5
* | | | | Merge "Camera2: fix flash light turn on after resume camera activity"Linux Build Service Account2014-06-201-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Camera2: fix flash light turn on after resume camera activitykaiyiz2014-06-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user choose an app to open video, onResume will be called after the choose dialog is dismiss. The function opencamera will be called and the value mPreviewFocused will be set true, which lead to flash light turn on when setCameraParameters. The value mPreviewFocused won't be true if not in Camera Preview, we can use the visible of mCameraControls to judge. CRs-Fixed: 680450 Change-Id: Ia04ae0fb77f05fb991e5262f86cbe6f308db7709
* | | | Merge "Camera2: missing rendering progress bar workaround"Linux Build Service Account2014-06-191-0/+4
|\ \ \ \
| * | | | Camera2: missing rendering progress bar workaroundLikai Ding2014-06-171-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | If panorama capture is stopped by device rotation, the rendering progress bar is sometimes not shown due to wrong layout result. Call requestLayout() on the progress bar as a workaround. Change-Id: Ib7c848e9ae3ced956dcc88877bb7f33357cdb588
* | | | Merge "Camera2: fix start preview when hdr is on issue"Linux Build Service Account2014-06-191-1/+2
|\ \ \ \
| * | | | Camera2: fix start preview when hdr is on issueKerong Sui2014-06-171-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we have already set hdr on and do not set off, we don't need to set it to scene mode to auto every time. This will make the camerea to start preview again, which will make the app freeze for a while Change-Id: Ica77106b88056e289cd298eda4ccc5c3f4f6ab59 CRs-Fixed: 679200
* / / / Camera2: fix The flashlight still is on after set scene mode not autokaiyiz2014-06-161-3/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set flash mode is on when scene mode is auto, the flash mode won't be reset when change to other scenemode and still is on. Set the flash mode is auto when scene mode is not auto. CRs-Fixed: 678466 Change-Id: If3874c03dc70297326b6cd7dcceb1f4efde85956
* | | Merge "Camera2: Adding support for Auto HDR"Linux Build Service Account2014-06-146-8/+150
|\ \ \
| * | | Camera2: Adding support for Auto HDRAbhishek Pant2014-06-066-8/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | | | Merge "Camera: Mem-leak"Linux Build Service Account2014-06-137-10/+74
|\ \ \ \
| * | | | Camera: Mem-leakSuman Mukherjee2014-06-097-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hprof identified memleak in localdatalist from list and hashmap Reason: removedata was not getting invoked. Fix Made: Invoke removedata from ondestroy and onresume of camera activity Cleanup bitmaps before reallocation on same variable. CRs-Fixed: 655256 Change-Id: I42d99beb7e493eea2394462ee02cbe956e86c502
* | | | | Camera2: fix a camera status bugLikai Ding2014-06-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a picture is taken for MMS app, the preview has been stopped in onPictureTaken() but the camera state is subsequently set to IDLE in ZSL mode. Add a check before assignment. Change-Id: I0610a58dbccffdba4b94140d74942c2ff60c7882 CRs-Fixed: 675176
* | | | | Merge "Camera2: Fix ANR when switching camera during AF"Linux Build Service Account2014-06-111-0/+3
|\ \ \ \ \
| * | | | | Camera2: Fix ANR when switching camera during AFVladimir Petrov2014-06-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check that 'mCameraDevice' is valid at beginning of setCameraParameters(). This will avoid null pointer exceptions at some cases, when setCameraParameters() is called by focus manager after closing camera. CRs-Fixed: 668405 Change-Id: Iff4b81e725db6db11cdc205512b0fec1f71f333d
* | | | | | Merge "Camera2: Fix flash item status incorrect when turn on/off AE-Bracket"Linux Build Service Account2014-06-111-3/+0
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:43:07 +0000