summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-071-6/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-6/+3
| | | | | | | | | | | | | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
* | SnapdragonCamera: disable instant capture in some cases.Jay Wang2016-05-261-20/+36
|/ | | | | | | | | | | 1. Disable instant capture when ZSL is off or advanced features are enabled 2. Change the instant capture option to support the selection of aggressive AEC and fast AEC CRs-Fixed: 998509 Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
* SnapdragonCamera: Fix incorrect focus modeJay Wang2016-05-021-1/+5
| | | | | | | | | | The camera device parameter was not re-set when the camera is switched back from camcorder mode. This causes the camera mode uses previous camera focus mode which was selected before switching to camcorder mode. CRs-Fixed: 1006900 Change-Id: I20bce0413d7f422da86acd44c39b27582593614d
* Merge "SnapdragonCamera: Fix auto HDR indication issue" into ↵Linux Build Service Account2016-04-171-18/+21
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix auto HDR indication issueJay Wang2016-04-071-18/+21
| | | | | | | | | | | | | | | | 1. Fix the logic on validating the auto HDR detection. 2. Move teh HDR indicator to more visible area CRs-Fixed: 999660 Change-Id: I797f69edc847b94f60c637373b80278783c3dac8
* | Merge "SnapdragonCamera: Adjusting view initialization" into ↵Linux Build Service Account2016-04-171-0/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Adjusting view initializationJack Yoo2016-04-061-0/+6
| |/ | | | | | | | | | | | | | | Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
* | Merge "SnapdragonCamera: fix instant capture setting issue" into ↵Linux Build Service Account2016-04-171-6/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: fix instant capture setting issueJay Wang2016-03-301-6/+6
| |/ | | | | | | | | | | | | | | | | | | | | The instant capture flag is set in a delayed runnable and causes a race condition that the flag is not set before camera thread configures the camera parameters. To resolve the issue, sets the instant capture flag in the main thread. Change-Id: Ic44a5df4d10fb2c641835e94cd4ec6790c759b36 CRs-Fixed: 994361
* | Merge changes I2139274e,I1d18d936 into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-04-171-6/+0
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix occasional touch AF/AEC detection failure. SnapdragonCamera: Hide remaining photo counter
| * | SnapdragonCamera: Fix occasional touch AF/AEC detection failure.Jay Wang2016-04-011-6/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | 1. Fix the issue that during pause/resume, the preview region was not set properly and focus manager ignore bottom part of preview region. 2. On device with sensitive touch screen, single tap can be detected as scroll gesture. Make change to consider scroll gesture as single tap gesture if it is not the left swipe gesture. Change-Id: I2139274e60799eac866b8bb70ea66144548b5845 CRs-Fixed: 997843
* | SnapdragonCamera: hide the preview surface during suspendJay Wang2016-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Occasionally, the previous preview frame is presented and caused the screen flashing, when continuously triggering suspend/resume. To resolve the issue, hide the preview surface during suspend and make it visible during resume. This helps to clear the remaining preview frames in the buffer. CRs-Fixed: 991416 Change-Id: I96fff0fdae6bd14263f33b1a9032604596cf49c1
* | SnapdragonCamera: Camera2 add zoom supportByunghun Jeon2016-03-301-0/+5
|/ | | | | | | Add zoom support to Camera2 CRs-Fixed: 989750 Change-Id: Id6b558ff5215f04ca7c201b1d1807521d615c353
* SnapdragonCamera: Remove accessing to dialog stringsJay Wang2016-03-291-4/+4
| | | | | | | | | | Accessing to translatable strings can lead to unexpected behavior when non-English is selected as system language. Making change to remove any accessing to translatable strings. Change-Id: I687abdff984bf0e5680c34861fac8c1271b88ead CRs-Fixed: 993382
* SnapdragonCamera: Turn on face detection for beautificationJack Yoo2016-03-281-0/+10
| | | | | | | Keep turning on face detection while beautification is on. Change-Id: I6039b6fecf8cc8d11dea925eff18af6ddc9a0da7 CRs-Fixed: 986633
* SnapdragonCamera: Turn off LONGSHOT on ubifocus scene modeJack Yoo2016-03-221-1/+3
| | | | | | | Turning off LONGSHOT mode to off when ubifocus scene mode is enabled. Change-Id: I5a1ce6a2c9fa08715da40a41f4aae694bd7f8654 CRs-Fixed: 984742
* SnapdragonCamera: Add the developer option for instant captureJay Wang2016-03-181-6/+54
| | | | | | | | | | | | A developer option is added to support instant capture feature in the camera HAL. Once option is enabled, Snapdragon camera application will take a snapshot as soon as it is resumed from the lock screen by pressing power button twice. For this to work, user also needs to enable "Press power button twice for camera" under display setting. Change-Id: I84794759ee1edc9424c37b71bd0c2b761a77bee1 CRs-Fixed: 970691
* SnapdragonCamera: Reset menu when device is rotatedByunghun Jeon2016-03-181-0/+1
| | | | | | | Reset the settings menu when the device is rotated Change-Id: I6c4fed7207a4d26a9d7c29d18f6a7af17ef3d4f9 CRs-Fixed: 981504
* SnapdragonCamera: Fix timing of preference initializationByunghun Jeon2016-03-171-5/+7
| | | | | | | Initialize preference before making the views visible. Change-Id: Ie3d541c7fcb29ed86e0e9fd52a1a1e4ea870f009 CRs-Fixed: 982842
* SnapdragonCamera: Disable continuous shot when HDR is enabledJay Wang2016-02-271-8/+9
| | | | | | | | HDR and continuous shot cannot be enabled at the same time. When HDR scene mode is selected, disable the continuous shot feature Change-Id: I2ba6d0fd6d09a3cd9de393e7d2c16303d434f972 CRs-Fixed: 979676
* SnapdragonCamera: Add persist property to skip the memory checkJay Wang2016-02-271-1/+7
| | | | | | | Adding a property to skeip the memory check during continuous shot CRs-Fixed: 978195 Change-Id: I45b24edd528339e9ca716581381c6890f355c8b7
* Revert "SnapdragonCamera: Checking memory and storage once a while only."Jay Wang2016-02-271-15/+7
| | | | | | | This reverts commit bb4f9d9aaf595ca698946a9c6ab7ce747060367d. CRs-Fixed: 978195 Change-Id: Iac7da127db7bb15bfd5607609c4c2be47a638aa7
* SnapdragonCamera: Checking the LONGSHOT status on shutter clickJack Yoo2016-02-031-0/+1
| | | | | | | If LongShot state is still active, avoid calling single snapshot. Change-Id: I5dafa31cbbf669333f9fc385de08d5414cbaa1f5 CRs-Fixed: 965742
* SnapdragonCamera: Fix blank preview issue during pause & resumeJay Wang2016-02-031-1/+1
| | | | | | | | | | | | | | | Continuous pause & resume operation by pressing the power button can cause the blank preview. The application close the camera when there is onPause or screen off intent. Sometimes the resume comes after screen off intent when user resumes the device quickly after pausing the device. Because of this race-condition, the camera is closed unintentionally. To resolve the issue, re-structure the code to receive screen-off intent only during video recording and stop the recording when intent is received. Change-Id: Ic993b83527b41dbbf53f63ef8ca25fa3a12fb77e CRs-Fixed: 970172
* SnapdragonCamera: Fix the memory leak on view.Jack Yoo2016-01-301-0/+7
| | | | | | | | Keep using modules instead of creating. Don't remove the view without cleaning it. Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0 CRs-Fixed: 958510
* SnapdragonCamera: Checking memory and storage once a while only.Jack Yoo2016-01-301-7/+15
| | | | | | | | To improve continuous shot fps, reduce the frequency of checking memory and storage available. Change-Id: I25a92103573186b11530f26cf2690ee3f1b088c2 CRs-Fixed: 933866
* SnapdragonCamera: Closing pie on auto focus change.Jack Yoo2016-01-301-0/+5
| | | | | | | | | Closing pie renderer on auto focus change in case of incomplete focus attempt. Move focusmode menu to developer option too Change-Id: I97faf95b640a8f4fedea8c5f2f8ca4ab020c8cca CRs-Fixed: 961396
* SnapdragonCamera: Fix NULL pointer exceptionJay Wang2016-01-201-1/+2
| | | | | | | | | There is a corner case that onShutterButtonClick() is called before camera device is configured. The change will make sure the camera device exists before continuing the operation. Change-Id: I2212572ea5c6073c3f62bdd38e83716b2427c87d CRs-Fixed: 962579
* SnapdragonCamera: Improving Burstmode performanceCamera Software Integration2016-01-201-7/+45
| | | | | | | | Calling media notify only once after the burst mode is finished. This reduces latency of the processing call back. Change-Id: I5ff4a369705cab4c8cee95f793733d2a0046e1d0 CRs-Fixed: 933866
* SnapdragonCamera: Restart preview in a corner caseCamera Software Integration2016-01-201-0/+2
| | | | | | | | | | | | | Issue: Both App & HAL not restarting the preview if Preview "feature.restart" setprop is enabled and so app got freeze. Fix: Restart preview in APP if NON ZSL HDR is enabled. CRs-Fixed: 953442 Change-Id: I4e2c9db20d5148de2b6b63288dc0d3eb75ee5a9c
* SnapdragonCamera: Updating preview size againCamera Software Integration2015-12-301-0/+5
| | | | | | | | On layout change, need to call preview size change again as it's not guaranteed it's called first always. Change-Id: I8a687fbf162924f36f2ff7be2a3ba1c6304b27f6 CRs-Fixed: 893423
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2015-12-221-1/+44
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* SnapdragonCamera: fix screen flash on resumingCamera Software Integration2015-12-221-2/+8
| | | | | | | | | | Currently preview cover will be hidden shortly after preview started, but if the actual first frame comes late, the main screen will flash. Register a oneshot preview callback to hide preview cover. Register the callback before calling startPreview. Change-Id: Ia9910c4302a598bd1faef87eb630c5c838e12d3b CRs-Fixed: 909772
* SnapdragonCamera: restore flash mode settingCamera Software Integration2015-12-221-8/+33
| | | | | | | | | | After user changes the scene mode back to "AUTO", making sure the flash mode is restored back to the correct value. Previously, the flash mode is forced to "OFF" if the scene mode is changed from others to "AUTO". Change-Id: I8170597f7f4f22fd010d13e3f5de52de0f93ca32 CRs-fixed: 927985
* SnapdragonCamera: Handle cam switch icon if numOfCams less than 2Sanjeev Garg2015-11-181-4/+8
| | | | | | | | | While generalizing SnapdragonCamera app for any number of cameras we have to handle a special case if number of camera's are less than 2. If there is only 1 camera in the app then there is no camera switch option and hence the corresponding switch icon object is null Change-Id: I672708bb98a30054adaf916bb272b50cdd8d0091
* SnapdragonCamera: Fix crash issue when changing TNR settingJay Wang2015-11-161-3/+14
| | | | | | | | Move the UI setting change to the UI thread instead of in Camera thread. CRs-Fixed: 931802 Change-Id: Ia38d0adf426c4ef7b3424df9649392ead9b0e604
* SnapdragonCamera: Fix the issue SoundPoolThread is not releasedJay Wang2015-11-131-3/+11
| | | | | | | | | | | | | | Two SoundPool objects are created during onCreate. However, the SoundPool is not released or re-used, properly and app continuously creating the new one. Fixing the issue for shutter button SoundPool by adding the releasing call and changing the call flow so it gets created and released during onPause and onResume. For count down SoundPool, we just re-use the existing SoundPool object instead of creating the new one. CRs-Fixed: 939366 Change-Id: I8ff1d62ce7b0e217df29ded92c9a07b02bf0ffbb
* Revert "SnapdragonCamera: fix screen flash on resuming"Byunghun Jeon2015-10-291-7/+1
| | | | | | This reverts commit 37856d6b3bcede0eb514e83d168d24b5f66d21c5. Change-Id: Ie16e324fb66b07deedf74dc2d3abefea607d92a0
* SnapdragonCamera: Fix crash issue with enable FD with TruePortraitByunghun Jeon2015-10-291-2/+13
| | | | | | | Fixes ui operation on background thread issue with always enabling FD with TruePortrait on. Change-Id: I976d206c2114aba1e1c5ae4b53959093c2836942
* Merge "SnapdragonCamera: Adding support for any number of cameras in app."Linux Build Service Account2015-09-301-24/+34
|\
| * SnapdragonCamera: Adding support for any number of cameras in app.Sanjeev Garg2015-09-161-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | At present the SnapdragonCamera App can support maximum of 2 cameras. Generalizing SnapdragonCamera App to support any number of cameras exposed to the application. Note - If number of cameras supported is greater than 2 then we need to add corresponding entries in media_profiles.xml so that recording can work fine on more than 2 cameras supported. Change-Id: Ic20667e29e0541d71c764bfd51a9c7a4d2ea83cd
* | Merge "SnapdragonCamera: fix a thumbnail update issue"Linux Build Service Account2015-09-291-0/+1
|\ \
| * | SnapdragonCamera: fix a thumbnail update issueLikai Ding2015-09-211-0/+1
| |/ | | | | | | | | | | | | | | After longshot, mLastJpegData is shown but never cleared. In next shot if focusing succeeds but no picture taken, the data is shown as thumbnail. Change-Id: I1f3865bc2db1e600494398d281791f25444dabf8 CRs-Fixed: 890598
* | Merge "SnapdragonCamera:Remove the "Enable Advance Capture" text from camera"Linux Build Service Account2015-09-291-1/+0
|\ \
| * | SnapdragonCamera:Remove the "Enable Advance Capture" text from cameralikaid2015-09-241-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | Remove the text when the user sets "Chroma Flash" to "On". It says "Enable Advance Capture will disable Continuous Shot". This is confusing and should be removed. When user sets "Chroma Flash" to "On", ui don't show toast info. Change-Id: I3e04d924b8a533d9eb9303743453073162959afe CRs-Fixed: 905008
* | Merge "SnapdragonCamera: Do not show focus when click invalid area."Linux Build Service Account2015-09-281-0/+1
|\ \
| * | SnapdragonCamera: Do not show focus when click invalid area.likaid2015-09-111-0/+1
| |/ | | | | | | | | | | | | | | | | | | There is no area limit for click which cause the focus is responsed when click the invalid area. Add a judgement to avoid responding to invalid area. Change-Id: I9229afe81d7f540136a706e89aac71346c370834 CRs-Fixed: 903140
* / SnapdragonCamera: Hide all camera setting when countdown timer startslikaid2015-09-141-0/+1
|/ | | | | | | | | | | | Camera setting including module switcher scene mode filter mode and front/back camera switcher should not be used during countdown timer, since it may cause unexpected concurrent errors. Hide all the camera settings when countdown timer starts, show them again after countdown. Change-Id: I79c2add63c61d304fe0948e1c9fefe3a8c1a6fee CRs-Fixed: 900086
* Merge "SnapdragonCamera: Always enable FD with TruePortrait on"Linux Build Service Account2015-09-101-16/+34
|\