summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic ↵Linux Build Service Account2015-01-1312-179/+326
|\ | | | | | | shoot""
| * Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Jay Wang2015-01-1312-179/+326
| | | | | | | | This reverts commit 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.
* | Merge "Revert "SnapdragonCamera: Fixed aspect ratio in panormic shoot""Linux Build Service Account2015-01-131-28/+6
|\|
| * Revert "SnapdragonCamera: Fixed aspect ratio in panormic shoot"Jay Wang2015-01-131-28/+6
| | | | | | | | This reverts commit 1ea460a89823864216b47aae767b0d8f5dceb3ee.
* | Merge "SnapdragonCamera: fix settings list can't disappear after resume camera"Linux Build Service Account2015-01-132-14/+20
|\ \
| * | SnapdragonCamera: fix settings list can't disappear after resume camerakaiyiz2015-01-102-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normal the animateFadeOut will be called when activity paused, but if click sub menu just before pause activity, the animateFadeOut will be blocked by flag POPUP_IN_ANIMATION. Make animateFadeOut and animateSlideOut use different flags for judge whether need to start animation or not. Change-Id: I49a0cb8f70771ccdd292b589a266a5417f78c6ef CRs-Fixed: 778167
* | | Merge "SnapdragonCamera: fix don't lock screen after press power key"Linux Build Service Account2015-01-132-5/+9
|\ \ \
| * | | SnapdragonCamera: fix don't lock screen after press power keykaiyiz2015-01-092-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window flag FLAG_SHOW_WHEN_LOCKED is workding even if press power key, so camera activity will not be close still run above locked screen UI. The CameraGestureActivity is start from screen off, so it will be a SecureCameraActivity. Finish activity as same as the secure camera activity. Change-Id: I76d8ff3d2f037b81140b35255b52b4c4f4de95d3 CRs-Fixed: 777770
* | | | Merge "SnapdragonCamera: Quick icon disappear after stop record by home key"Linux Build Service Account2015-01-131-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: Quick icon disappear after stop record by home keykaiyiz2015-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Color effect and switch camera icons disappear if re-launch camera after press home key during recording video. The icons are hided when start record video, but show icons aren't called after stop video record by press home key. Show and hide icons should always be called when stop and start record video, so move the functions to stopVideoRecord and startVideoRecord. Change-Id: Ie4fe9102e226452502fcc382329cc0e01799b0cf CRs-Fixed: 777114
* | | | Merge "SnapdragonCamera: support 4:3 preview on 16:9 screen"Linux Build Service Account2015-01-117-47/+222
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-087-47/+222
| | |/ | |/| | | | | | | | | | | | | | | | | | | When preview is set to 4:3 on a 16:9 screen, resize SurfaceView to 4:3 and cover other parts of the screen. Otherwise camera controls have a semi-transparent background. Change-Id: Icfbe6318b6a9de9a988468078b474e842f6ddd8c
* | | Merge "SnapdragonCamera: Remove Camera2 apk."Linux Build Service Account2015-01-091-0/+2
|\ \ \ | |/ / |/| |
| * | SnapdragonCamera: Remove Camera2 apk.Sai Kumar Sanagavarapu2015-01-071-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | Override Camera2 with SnapdragonCamera to remove Camera2 from build. This is to avoid confusion to user with similar camera apps in the build. Finally, there will be only two camera applications - SnapdragonCamera, which is the QC value added Camera app and another GoogleCamera, which is the stock Camera app provided by Google. Change-Id: Ifc50772848b5a5e9a64bc0371bd6980d8633e8ac
* | Merge "SnapdragonCamera: Don't override preferences for CMCC misc settings."Linux Build Service Account2015-01-071-11/+21
|\ \
| * | SnapdragonCamera: Don't override preferences for CMCC misc settings.Sai Kumar Sanagavarapu2015-01-051-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | Instead of overriding preferences and giving no way to change them again, just reset the preferences to corresponding off/default values, so that user can still be able to change them. Change-Id: I49f654d79af8268f170a611d5cbca28a2fa716ae
* | | Merge "SnapdragonCamera: Fix camera double open issue."Linux Build Service Account2015-01-071-0/+8
|\ \ \
| * | | SnapdragonCamera: Fix camera double open issue.Sai Kumar Sanagavarapu2015-01-041-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | If switch camera occurs before open camera thread completes, it will result in camera double open exception. Hence wait for open thread and then do switch. Change-Id: Id12f149a2b850dc7cf1c872cec016c95e604f713
* | | Merge "SnapdragonCamera: Do not prompt remember location pop up twice."Linux Build Service Account2015-01-071-1/+1
|\ \ \
| * | | SnapdragonCamera: Do not prompt remember location pop up twice.Santhosh Kumar Thimmanna Bhattar2015-01-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remember location pop up is shown twice as start preview is called twice when the snapdragon camera application is launched for the first time. - Fix is to not to start the preview if it is already started Change-Id: I5435acec3e731b2536c24b947e5e720c1a8d0d6b
* | | Merge "SnapdragonCamera: Fixed aspect ratio in panormic shoot"Linux Build Service Account2015-01-071-6/+28
|\ \ \
| * | | SnapdragonCamera: Fixed aspect ratio in panormic shootJay Wang2015-01-061-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed aspect ratio of the full screen preview. The camera preview size is chosen based on the aspect ratio of device screen. Change-Id: Ibc7c497a87d8f0cca2701d8709f010caa6f79308
* | | | Merge "SnapdragonCamera: fix app crash when switch to camcorder"Linux Build Service Account2015-01-074-4/+24
|\ \ \ \
| * | | | SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-164-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* | | | | Merge "Camera: Draw mouth indicator based on display orientation"Linux Build Service Account2015-01-061-5/+12
|\ \ \ \ \
| * | | | | Camera: Draw mouth indicator based on display orientationJing (Mia) Wang2014-12-221-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, mouth indicator is always drawn horizontally which is a vertical line in 90 and 270 degree cases. CRs-Fixed: 773385 Change-Id: I3ff1cae10a3131691e447f8b4f4bcef9ebb2f26c
* | | | | | Merge "SnapdragonCamera: Fix app crash when camera not support scenemode"Linux Build Service Account2015-01-061-7/+7
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: Fix app crash when camera not support scenemodeJing (Mia) Wang2014-12-201-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The front camera is not support set scenemode, the layout for show scenemode isn't initialize and NPE happened, which lead to app crash. The scene mode button shouldn't display when scene mode is not support. CRs-Fixed: 773391 Change-Id: I9c65fb5b65ecb276660b3281a5a591f7a3f2a134
* | | | | | Merge "SnapdragonCamera: Fix menu is covered when count down take picture"Linux Build Service Account2015-01-064-4/+21
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: Fix menu is covered when count down take pictureJing (Mia) Wang2014-12-204-4/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The textview of count down title layout is unreasonable, which lead to some view is covered by text. Modify the layout params of textview. CRs-Fixed: 773384 Change-Id: I4c6cd67dcc275730de1ad61396a86f3d7250b90b
* | | | | | Merge "SnapdragonCamera: Fix string display incompletely"Linux Build Service Account2015-01-061-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | SnapdragonCamera: Fix string display incompletelykaiyiz2014-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The width is not enough for the text string. Make the text string near close to icon to lengthen the string width. CRs-Fixed: 772925 Change-Id: I97c9f3deeaffb8e7a5c307d7745f7a00ea828370
* | | | | | Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-01-0612-326/+179
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-01-0512-326/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I98735dbed2ff4dada8708bf5a4a0f9da6ba030c7 Conflicts: res/layout-land/pano_preview_progress.xml res/layout-port/pano_preview_progress.xml
* | | | | | Merge "SnapdragonCamera: Create panoramic layout files"Linux Build Service Account2015-01-062-0/+238
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | SnapdragonCamera: Create panoramic layout filesJay Wang2015-01-052-0/+238
|/ / / / | | | | | | | | | | | | | | | | | | | | Add layout files for panoramic full-screen preview support Change-Id: I88d1653642670701a72819e53381211e66af2963
* | | | Merge "SnapdragonCamera: Fix app couldn't open Camera when Flashlight is on"Linux Build Service Account2015-01-041-2/+2
|\ \ \ \
| * | | | SnapdragonCamera: Fix app couldn't open Camera when Flashlight is onkaiyiz2015-01-031-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera couldn't be open when Flashlight is on because CameraDevice has been used. Receive the led flashlight intent and close flashlight. CRs-Fixed: 769624 Change-Id: Ib5be47cc93b55bb06637f15309b7d4bea694e58f
* | | | Merge "SnapdragonCamera: Fix continuous shot not display location info"Linux Build Service Account2015-01-041-7/+12
|\ \ \ \ | |/ / / |/| | |
| * | | SnapdragonCamera: Fix continuous shot not display location infokaiyiz2015-01-031-7/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Location info isn't write into the Media Database when store image, which leadcore location info couldn't show in details. Get the location info and write it into media database during longshot. CRs-Fixed: 708198 Change-Id: I5e4aa982e7689244a511865536f54a05a852d3f2
* | | Merge "SnapdragonCamera: show how many more pictures can be taken"Linux Build Service Account2014-12-249-0/+122
|\ \ \
| * | | SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-229-0/+122
| |/ / | | | | | | | | | | | | | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* | | Merge "SnapdragonCamera: Enable video recording pause/resume from application"Linux Build Service Account2014-12-241-2/+2
|\ \ \ | |/ / |/| |
| * | SnapdragonCamera: Enable video recording pause/resume from applicationSanthosh Kumar Thimmanna Bhattar2014-12-231-2/+2
|/ / | | | | | | | | | | | | | | | | - Video recording pause/resume feature is not working as it is disabled by commenting out the pause/resume function call from snapdragon camera application. - Fix is to enable the pause/resume function call from application Change-Id: If75ab41000d0c62259a46135246fafe3398f5fd9
* | Merge "SnapdragonCamera: Enable preference changed callback."Linux Build Service Account2014-12-171-1/+1
|\ \
| * | SnapdragonCamera: Enable preference changed callback.Sai Kumar Sanagavarapu2014-12-171-1/+1
|/ / | | | | | | | | | | | | Pass changed preference as an argument to onSharedPreferenceChanged so that linked preferences can be modified. Change-Id: Id35b0324c054f3b04739952ab20464dc58049ee2
* | Merge "Camera: Add CameraGestureActivity as alias of CameraActivity"Linux Build Service Account2014-12-164-0/+21
|\ \ | |/ |/|
| * Camera: Add CameraGestureActivity as alias of CameraActivityJing (Mia) Wang2014-12-104-0/+21
| | | | | | | | | | | | | | Make the activity could show above lock screen and turn on screen when it is started by gesture operation. Change-Id: I2099154f2325de83597b4262203c58a84b91f2d9
* | Merge "SnapdragonCamera: Add HVGA (480x360) video quality."Linux Build Service Account2014-12-143-0/+5
|\ \
| * | SnapdragonCamera: Add HVGA (480x360) video quality.Sai Kumar Sanagavarapu2014-12-133-0/+5
| | | | | | | | | | | | | | | | | | Add support for HVGA (480x360) video quality in camcorder settings. Change-Id: I3fd2bf4c266f2068cbe83301184d421e9278928e