summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: The alert dialog's rotation is not right"Linux Build Service Account2015-03-291-15/+16
|\
| * SnapdragonCamera: The alert dialog's rotation is not rightlikaid2015-03-261-15/+16
| | | | | | | | | | | | | | | | | | | | | | It will pop up a alert dialog if something goes wrong while generating mosaic. The alert dialog's rotation is not right, as a result, the alert dialog's UI will gose wrong. Use RotateLayout to set the rotation before we show the alert. Change-Id: Iaa91e811393a90c9f28f98404d782d2cc2ad9fe9 CRs-Fixed: 805471
* | Merge "SnapdragonCamera: Correct AutoHDR callback data size check"Linux Build Service Account2015-03-271-1/+1
|\ \ | |/ |/|
| * SnapdragonCamera: Correct AutoHDR callback data size checkEmilian Peev2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the AutoHDR functionality which handles metadata callbacks always assumes that the length of the callback data buffer will be equal to 12 bytes. It will always try to read and convert 3 32-bit integers. The check before this processing is incorrect as it allows buffers which are less than 12 bytes to be processed as well. This can lead to array out of bounds exceptions, which are also possible during FD snapshot metadata callbacks that don't contain any faces. In this particular scenario the metadata callback buffer size will be 8 bytes. Change-Id: I4094aaa56aa4135d2d806861353d49c8d7f9985c CRs-Fixed: 799110
* | Merge "Snapdragon Camera: Unlock AE&AWB before snapshot"Linux Build Service Account2015-03-261-6/+7
|\ \ | |/ |/|
| * Snapdragon Camera: Unlock AE&AWB before snapshotEmilian Peev2015-03-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the application contains logic which will lock AE&AWB before snapshot if AF didn't get triggered. Unlocking happens during image capture though and will get ignored because the camera state is already set to 'SNAPSHOT_IN_PROGRESS". This sequence of events can have side effects w.r.t. flash. To avoid this AE&AWB should always be unlocked before snapshot. Change-Id: I7b1d53fdd87f7e9c1a1bb3530e4c5a87a7b05605
* | Merge "SnapdragonCamera: Move the files to the correct location"Linux Build Service Account2015-03-231-0/+476
|\ \
| * | SnapdragonCamera: Move the files to the correct locationJay Wang2015-03-201-0/+476
| | | | | | | | | | | | Change-Id: Id2d94a3be141a068f8a5e8ba461901b07700b7cb
* | | Merge "SnapdragonCamera: Add beautification feature to SnapdragonCamera."Linux Build Service Account2015-03-236-41/+423
|\| |
| * | SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-206-41/+423
| | | | | | | | | | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* | | SnapdragonCamera: Fix AEC lock issue after non-zsl snapshot.Sai Kumar Sanagavarapu2015-03-201-1/+4
|/ / | | | | | | | | | | | | | | | | In non-zsl snapshot, focus manager is set to unlock AEC after setting camera parameters in startpreview(). Due to this, AEC gets unlocked only after next touch focus or any set param call. Fixed this by changing the order during startpreview(). Change-Id: I320d7b37c7107ce2242a52979505ff04029a83fa
* | Merge "SnapdragonCamera: Set Flash to be the first menu in settings"Linux Build Service Account2015-03-192-5/+5
|\ \
| * | SnapdragonCamera: Set Flash to be the first menu in settingsByunghun Jeon2015-03-172-5/+5
| | | | | | | | | | | | Change-Id: Ia451a2fff983f3bfc850f066d7346d90d0a91dab
* | | Merge "Snapdragon: Add HDR to scene mode menu"Linux Build Service Account2015-03-191-14/+29
|\ \ \
| * | | Snapdragon: Add HDR to scene mode menuByunghun Jeon2015-03-171-14/+29
| |/ / | | | | | | | | | | | | | | | Add HDR as a scene mode to scene mode menu Change-Id: I0d6d9c87d09e72dd24f6d1a2e26fab91f7cb700e
* | | Merge "SnapdragonCamera: Update the preview thumbnail after continuous shot"Linux Build Service Account2015-03-181-0/+11
|\ \ \
| * | | SnapdragonCamera: Update the preview thumbnail after continuous shotlikaid2015-03-171-0/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In continuous shot mode, we do not update the preview thumbnail for each snapshot, instead, update it only once at the end of shotting with the final jpeg data. Change-Id: I388fb42688992f1e4ff8d3b7243d9f564bfe777a CRs-Fixed: 795476
* | | Merge "Snapdragon Camera: Check mosaic preview dimensions"Linux Build Service Account2015-03-171-3/+8
|\ \ \ | | |/ | |/|
| * | Snapdragon Camera: Check mosaic preview dimensionsEmilian Peev2015-03-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The preview dimensions used during the Mosaic libray initialization should be verified. Using invalid values like "0x0" could result in a crash of the JNI library. Change-Id: I5f66c2b2cc1a3d74898b5028933e578ea4097dfb
* | | Merge "Snapdragon Camera: Override flash mode to off during non-auto scene"Linux Build Service Account2015-03-171-5/+4
|\| |
| * | Snapdragon Camera: Override flash mode to off during non-auto sceneEmilian Peev2015-03-051-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the flash mode on application side will be set to 'auto' during scenes different from 'auto'. Due to the manual white balance modes used in these scenes it makes more sense to actually have flash mode set to off. Change-Id: Iaae2bc0d392f9dc384a68ad6390f9510eb7a65ed CRs-Fixed: 765000
* | | Merge "Snapdragon Camera: Unlock AE&AWB during longshot"Linux Build Service Account2015-03-171-0/+7
|\| |
| * | Snapdragon Camera: Unlock AE&AWB during longshotEmilian Peev2015-03-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Both AWB&AE are currently locked during longshot. This can have side effects for cases which utilize torch flash. Change-Id: I1fec80a3a869c1a71be8d724b1b8771e88411ae5 CRs-Fixed: 770028
* | | Merge "Snapdragon Camera: Avoid null pointer exception during shutter focus"Linux Build Service Account2015-03-171-2/+4
|\| |
| * | Snapdragon Camera: Avoid null pointer exception during shutter focusEmilian Peev2015-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | An additional check needs to be added for the focus manager initialization during handling of the shutter button focus event. Change-Id: Ie43a2376f42644ec493ffe1af53c9c5a1c279ec4 CRs-Fixed: 766843
* | | Merge "SnapdragonCamera: Don't display metadata in paused state"Linux Build Service Account2015-03-171-1/+4
|\| |
| * | SnapdragonCamera: Don't display metadata in paused stateEmilian Peev2015-03-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The media metadata retrieval is executed in separate 'async' thread. Once done an UI dialog is generated using the resulting data. A race condition is possible when the query thread is triggered and the activity itself is paused. If the task finishes after the application is no longer running, then the UI dialog box sequence can lead to a runtime exception. To resolve this an additional check is needed which will skip the metadata display step in case the applicaiton is already paused. Change-Id: I19e2a044441e4bfb9eca05445a821a2f7bc43548
* | | Merge "Camera: Avoid state switch during preview start"Linux Build Service Account2015-03-171-0/+3
|\| | | |/ |/|
| * Camera: Avoid state switch during preview startEmilian Peev2015-03-051-0/+3
| | | | | | | | | | | | | | | | | | If snapshot is running avoid changing the camera application state during handling of 'ON_PREVIEW_STARTED' messages. Change-Id: I1654752d431d41d3219f235a08f77e1d7dd10c27 CRs-Fixed: 747816
* | Merge "SnapdragonCamera: Fix preview broken when coming back from gallery"Linux Build Service Account2015-03-161-3/+4
|\ \
| * | SnapdragonCamera: Fix preview broken when coming back from galleryByunghun Jeon2015-03-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix preview broken when user goes to gallery using thumbnail in portrait, rotates to landscape in gallery and back key to come back to camera Change-Id: Ib9a8ce69bfbb85573cae55da79901705f726cc22 CRs-Fixed: 802169
* | | Merge "SnapdragonCamera: Fix settings menu layout dirction from right to ↵Linux Build Service Account2015-03-142-17/+42
|\ \ \ | | | | | | | | | | | | left in RTL mode."
| * | | SnapdragonCamera: Fix settings menu layout dirction fromlikaid2015-03-132-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right to left in RTL mode. Use gravity of RIGHT instead of LEFT in RTL mode. Change-Id: I879fd0351c447b35a5dac7fe14e1698b08883583 CRs-Fixed: 801704
* | | | SnapdragonCamera: Draw the mouth position according to the orientationlikaid2015-03-132-22/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouth position on FaceView wasn't right in landscape mode because the orientation didn't change when rotated device. Re-correct the position of mouth when the device orientation changed. Change-Id: I81115bda8636e24484f2bda55415ebc0fa0a1f9a CRs-Fixed: 792980
* | | SnapdragonCamera: Disable CDS and TNR if SeeMore is enabledShwetha Kotekar2015-03-101-20/+48
| | | | | | | | | | | | | | | | | | | | | If seeMore is enabled, send a disable command to HAL to disable the CDS and TNR features. Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003
* | | Camera2: Disable SeeMore feature during 4K videoShwetha Kotekar2015-03-101-2/+13
| | | | | | | | | | | | | | | | | | | | | If the video resoultion is 4K, disable SeeMore and show a toast message. Change-Id: Ica6d5cf0e24154556fcdf44df9172ca255fe030a
* | | Camera2: Add StillMore option in Camera app menuShwetha Kotekar2015-03-102-9/+50
|/ / | | | | | | | | | | | | Add menu item for StillMore feature under the Advanced Features item during camera preview. Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b
* / SnapdragonCamera: openLegacy to open HAL1 cameraRajaram Gudivada2015-03-051-1/+8
|/ | | | | | | | When HAL 3 module is enabled by default, use .openLegacy with api version CAMERA_HAL_API_VERSION_1_0 to get the HAL1 device instead of the regualar open call. Change-Id: I4637b1f03c56b461fcfa2d29fe8f1064c5cbb6b1
* Merge "SnapdragonCamera: Set highest supported video resolution by default."Linux Build Service Account2015-02-272-17/+6
|\
| * SnapdragonCamera: Set highest supported video resolution by default.Sai Kumar Sanagavarapu2015-02-272-17/+6
| | | | | | | | | | | | | | Instead of defaulting to CIF, set the highest supported video resolution as the default video profile. Change-Id: I6cb1eab905d193cbc03f528d0fbc81f5af49ab89
* | SnapdragonCamera: Throw error popup for unsupported video profile.Sai Kumar Sanagavarapu2015-02-271-0/+14
|/ | | | | | | Check if the quality selected has a matching camcorder profile associated and show error popup if not supported. Change-Id: If3e1e3d62b4e2e9c8c16b9e4a346cbfa93c0f92b
* Merge "Snapdragon: Fix orientation of Prepare panorama dialog"Linux Build Service Account2015-02-261-7/+7
|\
| * Snapdragon: Fix orientation of Prepare panorama dialogByunghun Jeon2015-02-251-7/+7
| | | | | | | | | | | | | | Put Prepare panorama dialog to proper orientation instead of fixed to portrait Change-Id: I0f3bc9bcd5a5e30566c37b1e7beac9df73af7e61
* | Merge "SnapdragonCamera: Allow edit in Gallery2 if launched from Snapcam"Linux Build Service Account2015-02-251-0/+5
|\ \
| * | SnapdragonCamera: Allow edit in Gallery2 if launched from SnapcamByunghun Jeon2015-02-241-0/+5
| | | | | | | | | | | | Change-Id: I67afa657adfc137a70f0c5d8d831bc2b0cbdaaeb
* | | Merge "SnapdragonCamera: don't hide count down title"Linux Build Service Account2015-02-251-4/+17
|\ \ \ | |_|/ |/| |
| * | SnapdragonCamera: don't hide count down titleLikai Ding2015-02-171-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | Don't hide count down title, instead, rotate and offset it to correct position. Change-Id: I31aca121bc7f8b5e672b6457e049c186ac1179d3 (cherry picked from commit 7023e606647cb5c2b60582a3755309565748f1fd)
* | | Merge 9ea5b17335b70c4357d0838edddb55c1a0f13db8 on remote branchLinux Build Service Account2015-02-241-0/+4
|\ \ \ | |_|/ |/| | | | | Change-Id: Ic9b6983cf7b5111fe97188464b5ed31bfa7f2574
| * | Merge "SnapdragonCamera: fix panorma capture direction issue"Linux Build Service Account2015-02-231-0/+4
| |\ \
| | * | SnapdragonCamera: fix panorma capture direction issuelikaid2015-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the orientation is 90 or 180, the indicator direction is opposite to the moving direction. Correct the direction when orientation is 90 or 180. Change-Id: If2cda1da6db2e6ae219cb57567801fed0b4ca012 CRs-Fixed: 792977