summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "SnapdragonCamera: fix camera preview broken when resume from gallery"Linux Build Service Account2015-03-231-6/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | SnapdragonCamera: fix camera preview broken when resume from gallerylikaid2015-03-021-6/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The postion of preview view wasn't centered after rotated device with camera in background. Adjust the view position when camera draws preview layout each time. Change-Id: I488c25cda23f101cf1f1a10c54ca3d537474e53c CRs-Fixed: 795482
* | | | | SnapdragonCamera: Handle CAMERA_ERROR_SERVER_DIED message gracefully.Sai Kumar Sanagavarapu2015-03-204-3/+13
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle CAMERA_ERROR_SERVER_DIED message from lower layers by finishing the activity and there by closing camera session and app gracefully. In all other error cases, raise exception and kill app as exists already. Change-Id: I86c4caf174356148bd4725329ea13ec82e944b94
* | | | Merge "SnapdragonCamera: Fix app FC when time lapse and HFR is set to ON"Linux Build Service Account2015-03-202-5/+31
|\ \ \ \ | |_|/ / |/| | |
| * | | SnapdragonCamera: Fix app FC when time lapse and HFR is set to ONlikaid2015-03-112-5/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After HFR and time lapse both are on, the ListMenu is initialize again and mListMenu is set null which lead to NullPointerException happened. Don't initialize listmenu when it's showing, move toast to VideoMenu reference similar code in PhotoModule. Change-Id: I9eaa308cc1b5eccb7bc86a3da6ae99f09b280be9 CRs-Fixed: 796135
* | | 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: Fix preview window race condition."Linux Build Service Account2015-03-181-13/+16
|\ \ \ \
| * | | | SnapdragonCamera: Fix preview window race condition.Sai Kumar Sanagavarapu2015-03-151-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There could be race condition between onPreviewUIReady() and start preview thread leading to final null preview window being set to camera device even though a valid surface is available at the time of start preview. Fix this by synchronizing these two threads. Change-Id: I07654ee3c5d1c71530ef5b588f30d22c65f04e61
* | | | | Merge "SnapdragonCamera: Update the preview thumbnail after continuous shot"Linux Build Service Account2015-03-171-0/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | SnapdragonCamera: Update the preview thumbnail after continuous shotlikaid2015-03-121-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
* | | | SnapdragonCamera: Enable low power mode in Camera.Sai Kumar Sanagavarapu2015-03-151-0/+23
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Enable low power mode in camera usecase as well. Earlier its enabled only in camcorder mode. One exception in camera usecase where LPM is disabled is when flip (preview/snapshot/video) is enabled. Change-Id: I3e391345cac64b3dd8b7156fc98a806f4626d110
* | | Merge "SnapdragonCamera: Fix preview broken when coming back from gallery"Linux Build Service Account2015-03-131-3/+4
|\ \ \
| * | | SnapdragonCamera: Fix preview broken when coming back from galleryByunghun Jeon2015-03-061-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-132-17/+42
|\ \ \ | | | | | | | | | | | | left in RTL mode."
| * | | SnapdragonCamera: Fix settings menu layout dirction fromlikaid2015-03-062-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-102-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
* | 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
| * | | Snapdragon: Fix photo/video preview to match with captured photo/videoByunghun Jeon2015-02-203-63/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Photo and video preview and the captured results are different for some resolutions. Fix them to match the result. Change-Id: Ie5fb1954448fa54ffb968f2882e74bfd98c97548 CRs-Fixed: 791082
| * | | Merge "SnapdragonCamera: Fix play the video directly when goto gallery"bait_dispatcher_monitor_system2015-02-191-2/+14
| |\ \ \
| | * | | SnapdragonCamera: Fix play the video directly when goto gallerylikaid2015-02-121-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicked the preview thumbnail of a video, Camera launched Gallery with the action Intent.ACTION_VIEW, it caused Gallery play the video directly after Gallery started. Set the action Intent.ACTION_MAIN when launched Gallery. Change-Id: I74c9fc7b66a8ddb5fd06ceba5a0bd370e97b1154 CRs-Fixed: 794309
| * | | | Merge "SnapdragonCamera: circular thumbnail icon"bait_dispatcher_monitor_system2015-02-198-126/+197
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-108-126/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b
| * | | | Merge "SnapdragonCamera: Wake up screen when invoke camera by gesture"Linux Build Service Account2015-02-121-19/+31
| |\ \ \ \
| | * | | | SnapdragonCamera: Wake up screen when invoke camera by gesturelikaid2015-02-101-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The screen didn't wake up when invoked camera by gesture on dark screen, which caused the camera view couldn't be shown successfully. Acquire a wake lock at the beginning of onCreate, to make sure the screen could be lighten up, release the lock in onDestroy. Change-Id: I081c1e8a02d9eee18e6f33b2e6535a777feb1348 CRs-Fixed: 788479
* | | | | | SnapdragonCamera: Set longshot enable after AF done.Sai Kumar Sanagavarapu2015-02-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable longshot to backend only after AF done. This will help in storing 3A related params after AF result based on longshot enable/disable event. Change-Id: Iebdb9b324e758125704959d9a67ba0d0a6772e7a
* | | | | | Snapdragon: Fix photo/video preview to match with captured photo/videoByunghun Jeon2015-02-203-63/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Photo and video preview and the captured results are different for some resolutions. Fix them to match the result. Change-Id: Ie5fb1954448fa54ffb968f2882e74bfd98c97548 CRs-Fixed: 791082
* | | | | | Merge "SnapdragonCamera: Fix play the video directly when goto gallery"bait_dispatcher_monitor_system2015-02-191-2/+14
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: Fix play the video directly when goto gallerylikaid2015-02-171-2/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicked the preview thumbnail of a video, Camera launched Gallery with the action Intent.ACTION_VIEW, it caused Gallery play the video directly after Gallery started. Set the action Intent.ACTION_MAIN when launched Gallery. Change-Id: I74c9fc7b66a8ddb5fd06ceba5a0bd370e97b1154 CRs-Fixed: 794309 (cherry picked from commit 4c0d475c7d3be21487a34491a0072918dbbac230)
* / | | | | SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-178-126/+197
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* | | | | SnapdragonCamera: Disable LPM if DIS/Flip are enabled.Sai Kumar Sanagavarapu2015-02-131-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Low power mode has to be disabled if DIS or Flip are enabled, because we need pproc to process these. Change-Id: I00cc015f23f8e16d3acadc995ad2f6839c2d8333
* | | | | SnapdragonCamera: Wake up screen when invoke camera by gesturelikaid2015-02-131-19/+31
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The screen didn't wake up when invoked camera by gesture on dark screen, which caused the camera view couldn't be shown successfully. Acquire a wake lock at the beginning of onCreate, to make sure the screen could be lighten up, release the lock in onDestroy. Change-Id: I081c1e8a02d9eee18e6f33b2e6535a777feb1348 CRs-Fixed: 788479
* | | | Merge "SnapdragonCamera: set histogram orientation"Linux Build Service Account2015-02-111-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: set histogram orientationLikai Ding2015-02-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Set histogram rotation during orientation change. Change-Id: I6f9a6fb9a1761fc3a7f926f16794f8db8b61c78c
* | | | Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-02-108-40/+113
|\ \ \ \
| * | | | SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-098-40/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* | | | | Merge "SnapdragonCamera: Cover the preview until the preview really starts"Linux Build Service Account2015-02-102-4/+8
|\ \ \ \ \