summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Camera: Store brightness value persistentlySanthosh Kumar H E2014-10-161-0/+10
|/ | | | | | | | | | | Currently the last brightness value configured by client is not stored and will get reset on each application start. The suggested changes will store the last user configuration in SharedPreferences and make this setting persistent. Change-Id: I181af9fd224ee0465fc488e16a2e0a38ca612e72
* Merge "SanpdragonCamera: Disable continuous shot for advanced capture"Linux Build Service Account2014-10-091-3/+9
|\
| * SanpdragonCamera: Disable continuous shot for advanced captureIvan Evlogiev2014-10-071-3/+9
| | | | | | | | | | | | - Continuous shot needs to be disabled for continuous capture Change-Id: Id83431cff69da778df8cf815731688e73505b0c3
* | Merge "SnapdragonCamera: Add support for CDS and TNR settings"Linux Build Service Account2014-10-081-0/+38
|\ \ | |/ |/|
| * SnapdragonCamera: Add support for CDS and TNR settingsDimitar Borisov2014-09-301-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | Add support for CDS and TNR settings - CDS and TNR can be controlled in photo mode and video mode. - CDS is set to off and cannot be set to other value when TNR is enabled - CDS value is restored when TNR is disabled again CRs-Fixed: 715042 Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
* | SnapdragonCamera: Fix for zsl capture with flip appliedDimitar Borisov2014-09-301-4/+6
|/ | | | | | | | - We should not overwrite horizontal with vertical picture flip and vice versa when in zsl mode and rotation is 90 or 270 degrees. CRs-Fixed: 727742 Change-Id: I926d6b3f198669d1d582e4375bd02ec4d42e57c0
* Merge "SnapdragonCamera: Add HDR need 1x menu selection"Linux Build Service Account2014-09-191-0/+10
|\
| * SnapdragonCamera: Add HDR need 1x menu selectionIvan Evlogiev2014-09-111-0/+10
| | | | | | | | | | | | - HDR need 1x can be true (default) or false Change-Id: I184ad034d61165becb9fb95a0963e8e8c0752558
* | SnapdragonCamera: Do not reset exposure valueSusmitha Gummalla2014-09-111-3/+0
|/ | | | | | | | Exposure value set by user is not being retained as it is being reset in the APP. Removed the reset functionality to fix the same. Change-Id: I0f5fe96dddd605515182d9827bf4d3e75e0c99f2 CRs-fixed: 720624
* SnapdragonCamera: Add HDR mode menu selectionIvan Evlogiev2014-08-211-0/+11
| | | | | | - HDR mode can be sensor (default) or multi-frame Change-Id: I4513c52e9050d66e25d70ed8f484637dc75c6196
* SnapdragonCamera: Switch to SD card when internal storage is fullkaiyiz2014-08-211-0/+6
| | | | | | | | | | | | | | | | When internal storage is full, switch to SD card for storage. Change the save path from internal storage to SD card when updateStorageSpace is called if: 1. Internal storage is the current save path and does not have enough space 2. SD card has enough space Display a toast message and update display of the save path menu item when the storage path is switched. CRs-Fixed: 687210 Change-Id: I6a9804e4f64e6d55c6aebd889ac2ce5e887cfa5a
* SnapdragonCamera: Don't disable shutter button in longshot mode.Sai Kumar Sanagavarapu2014-08-211-2/+4
| | | | | | | | | | | | Problem scenario: If longshot gets turned off even before first capture is completed, there might be a possibility of shutter button getting disabled permanently. Fix: Shutter button need not be disabled in longshot usecase. Change-Id: I94cdb1e3f6d63a71699014cc59e5bc8438506c34
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* 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
* | Camera2: fix face still display after unmark the face detect optionkaiyiz2014-07-141-1/+1
|/ | | | | | | | | | | 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: fix white balance still work when turn on the HDR mode"Linux Build Service Account2014-07-081-3/+5
|\
| * Camera2: fix white balance still work when turn on the HDR modekaiyiz2014-07-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-110/+131
|\ \
| * | Camera2: Add support to save Depth map for refocusIvan Evlogiev2014-06-301-110/+131
| | | | | | | | | | | | | | | | | | | | | 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-071-3/+38
|\| |
| * | Camera: Initial Refocus supportEmilian Peev2014-06-261-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Revert "Camera: Mem-leak""Linux Build Service Account2014-06-301-5/+1
|\ \ \ | |_|/ |/| |
| * | Revert "Camera: Mem-leak"Vijay kumar Tumati2014-06-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+4
|\ \ \
| * \ \ Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | 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 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-141-5/+116
|\ \ \
| * | | Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | | | Merge "Camera: Mem-leak"Linux Build Service Account2014-06-131-1/+5
|\ \ \ \
| * | | | Camera: Mem-leakSuman Mukherjee2014-06-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Make continuous shot only support jpeg format picture"Linux Build Service Account2014-06-061-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Camera2: Make continuous shot only support jpeg format picturekaiyiz2014-05-301-0/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When click continuous shot, other format picture can also be chosen. Modify to acheive that when we click continuous shot,the picutre format can only be jpeg format. CRs-fixed: 671041 Change-Id: Ifb99342bff3715ea0ab1eb1061b02d342d7574e9
* | | Merge "Camera2: Query support for longshot and ZSL+HDR from parameters."Linux Build Service Account2014-06-041-0/+24
|\ \ \
| * | | Camera2: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-021-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* | | | Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-031-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HDR function can not existed with the Continuous Shot function,so change code to achieve the function like that when we open HDR function ,make the Continuous Shot off, and we close HDR,make the Continuous Shot on. CRs-fixed: 667319 Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
* | | | Merge "Camera2: disable ZSL setting during counting down"Linux Build Service Account2014-06-011-2/+3
|\ \ \ \ | |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-17 03:44:54 +0000