summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Fix app FC when time lapse and HFR is set to ON"Linux Build Service Account2015-04-242-5/+31
|\
| * SnapdragonCamera: Fix app FC when time lapse and HFR is set to ONlikaid2015-03-202-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 "Snapdragon : Changes to add more HFR values in camera UI."Linux Build Service Account2015-04-212-0/+4
|\ \
| * | Snapdragon : Changes to add more HFR values in camera UI.Guruprasad Gaonkar2015-04-092-0/+4
| | | | | | | | | | | | | | | | | | 240fps is added to HFR camera UI options. Change-Id: I01076e545736670eb0761cc5d7bea1dde197bb66
* | | Merge "SnapdragonCamera: Popup menu doesn't support RTL mode"Linux Build Service Account2015-04-154-74/+181
|\ \ \
| * | | SnapdragonCamera: Popup menu doesn't support RTL modelikaid2015-04-094-74/+181
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Coordinate direction is opposite in RTL mode. Modify Coordinate direction in RTL mode. Change-Id: I3fcd42fc27d430b486f9cccdde5ecec0d0468d30 CRs-Fixed: 819310
* | | Merge "SnapdragonCamera: fix camera FC when internal storage isn't enough"Linux Build Service Account2015-04-152-2/+8
|\ \ \
| * | | SnapdragonCamera: fix camera FC when internal storage isn't enoughlikaid2015-04-082-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The menu may be not initialized when switch save path in PhotoModule. Check the menu initialized state before switch save path. Change-Id: Ibdc8d5510924b45f5abfc13f4d70dcf9620c8b7d CRs-Fixed: 801619
* | | Merge "SnapdragonCamera: fix crash with persist.panel.orientation"Linux Build Service Account2015-04-152-0/+0
|\ \ \
| * | | SnapdragonCamera: fix crash with persist.panel.orientationLikai Ding2015-04-022-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The two layout files were only available in portrait mode. Make them as default. Change-Id: Iabc4caf1a5b5b015a097a914b489f412153eeec4
* | | | Merge "SnapdragonCamera: Gallery2 Can't show the newest picture"Linux Build Service Account2015-04-151-0/+2
|\ \ \ \
| * | | | SnapdragonCamera: Gallery2 Can't show the newest picturelikaid2015-04-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera give Gallery2 the newest picture's index is wrong in RTL mode. Give Gallery2 the correct index. Change-Id: Ie0f3835f0a9ab46b408ffe0b4ea5dd60906267e0 CRs-Fixed: 816284
* | | | | Merge "SnapdragonCamera: Customize camera video quality"Linux Build Service Account2015-04-152-1/+9
|\ \ \ \ \
| * | | | | SnapdragonCamera: Customize camera video qualitylikaid2015-04-092-1/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SnapdragonCamera's default video quality value was set to highest supported video resolution whitch was "720P" Add the default video quality value string "pref_video_quality_default" and overlay it to "VGA" CRs-Fixed: 815638 Change-Id: I5013880a42028e0663a3d22ffa3cddf87990146b
* | | | | Merge "SnapdragonCamera: customize camera picture quality"Linux Build Service Account2015-04-154-8/+8
|\ \ \ \ \
| * | | | | SnapdragonCamera: customize camera picture qualitylikaid2015-04-084-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regional feature Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf CRs-Fixed: 815630
* | | | | | Merge "SnapdragonCamera: fix messy photo in Panorama mode"Linux Build Service Account2015-04-151-1/+1
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: fix messy photo in Panorama modeLikai Ding2015-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If camera is kept still in panorama mode, the result looks messy. The root cause is that, when calculating and comparing distance in Blend::ComputeMask, double numbers are compared directly. Comparing them against a small negative number fixes the problem. Change-Id: I713f59b4e21c508e20eb4dabc5edb1652b3ddb1a CRs-Fixed: 794974
* | | | | | | Merge "SnapdragonCamera: fix camera preview broken when resume from gallery"Linux Build Service Account2015-04-141-6/+2
|\ \ \ \ \ \ \
| * | | | | | | SnapdragonCamera: fix camera preview broken when resume from gallerylikaid2015-03-231-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
* | | | | | | | Merge "SnapdragonCamera: Add cancel longshot prompt message in Chinese"Linux Build Service Account2015-04-111-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | SnapdragonCamera: Add cancel longshot prompt message in Chineselikaid2015-04-081-0/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The continue shooting need 40M memory at least, When the memory is not enough, it will show the warning message as "run out of memory, canceling longshot" and stop shooting. The string msg_cancel_longshot_for_limited_memory wasn't translate into Chinese. Add Chinese string for msg_cancel_longshot_for_limited_memory. Change-Id: Ib2a9df880ce44a106e11fe873216954b0575ec95 CRs-Fixed: 809502
* | | | | | | Merge "SnapdragonCamera: fix a panorama memory leak"Linux Build Service Account2015-04-081-0/+1
|\ \ \ \ \ \ \
| * | | | | | | SnapdragonCamera: fix a panorama memory leakLikai Ding2015-03-311-0/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free imgMos at the end of runBlend() Change-Id: I9211cf70ae75dbb5d5db31cfe6984374e7c51d5f
* | | | | | | Merge "SnapdragonCamera: [Smartfren] The Storage position should be SD card."Linux Build Service Account2015-04-081-0/+25
|\ \ \ \ \ \ \
| * | | | | | | SnapdragonCamera: [Smartfren] The Storage position should be SD card.likaid2015-03-311-0/+25
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app doesn't not eanble this funtion for setting SD card as the default storage postion in Smartfren. Check persist.env.camera.saveinsd overlay flag at Smartfren mode, when sdCard is writeable, set sdCard as default storage for the first time. Change-Id: Ia71e5d97a78da121a8bccfcd0032928a17566023 CRs-Fixed: 815639
* | | | | | | Merge "SnapdragonCamera: fix crash during module switch"Linux Build Service Account2015-04-081-4/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | SnapdragonCamera: fix crash during module switchLikai Ding2015-04-031-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When module is switched from camcorder to camera, on UI thread, it calls setFlipValue and then setParameters in onOrientationChanged. Meanwhile, background OpenCameraThread is modifying mParameters in startPreview(). This leads to a ConcurrentModificationException. Check camera state in onOrientationChanged. If it's not IDLE, skip setFlipValue and setParameter since these will be done in startPreview. This change also fixes camera UI orientation during a landscape launch. Change-Id: I15ed1e2bbbfc95f1b53b7309b72942d98350c564 CRs-Fixed: 815034
* | | | | | Merge "SnapdragonCamera: Handle Camera device errors gracefully."Linux Build Service Account2015-04-065-8/+43
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: Handle Camera device errors gracefully.Sai Kumar Sanagavarapu2015-03-265-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle Camera device errors from lower layers gracefully by finishing the activity and there by closing camera session and app. Also, display a toast message signifying the error because of which camera app is being shutdown. Change-Id: I86c4caf174356148bd4725329ea13ec82e944b94
* | | | | | | Merge "SnapdragonCamera: Make video duration icon display."Linux Build Service Account2015-04-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | SnapdragonCamera: Make video duration icon display.likaid2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ListPreference can not display icon bitmap. Modify ListPreference to IconListPreference to make icon show. Change-Id: Ice78cf375035ab527e1e1c2683f448cdbbb907da CRs-Fixed: 809557
* | | | | | | | Merge "SnapdragonCamera: Update the storage space status after remount SDcard"Linux Build Service Account2015-04-042-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | SnapdragonCamera: Update the storage space status after remount SDcardlikaid2015-04-032-0/+21
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add broadcast receiver to monitor SDcard status, update the storage space and hint when the SDcard was mounted or unmounted. Change-Id: I4b114d42d26091588d745fee874c04d595d5cfa1 CRs-Fixed: 790983
* | | | | | | | Merge "SnapdragonCamera: Change the text shadow color on camera sub menu"Linux Build Service Account2015-04-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | SnapdragonCamera: Change the text shadow color on camera sub menulikaid2015-04-031-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text shadow color was shown out of menu range when the entry name was long. Change the shadow color to transparent to avoid this issue. Change-Id: I88c482d3c9a94b6f180326e43b5e5096026dd97a CRs-Fixed: 801018
* | | | | | | | Merge "SnapdragonCamera: Stop panorama capture when move to opposite direction"Linux Build Service Account2015-04-042-0/+23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SnapdragonCamera: Stop panorama capture when move to opposite directionlikaid2015-04-032-0/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In panorama capture mode, when user moved to the opposite from the original direction, stop the capture and save current picture. Change-Id: I716a08f2fc497301fb8a6c6a124211b855cd9a77 CRs-Fixed: 801022
* | | | | | | Merge "SnapdragonCamera: Fix face detection UI offset"Linux Build Service Account2015-04-031-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SnapdragonCamera: Fix face detection UI offsetSanthosh Kumar H E2015-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert face detection UI offset on old UI. Change-Id: Idcc3bec22883ca6734ca6eb29c49169645c5300a
* | | | | | | Merge "SnapdragonCamera: Fix capture picture not to store"Linux Build Service Account2015-04-021-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SnapdragonCamera: Fix capture picture not to storelikaid2015-04-021-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enter gallery quickly after taking snap,the onPictureTaken in framework will not response which cause the picture can not be saved and make this bug happen. When judge the camera state is in the snap progress,not enter to gallery so that the picture can be saved. Change-Id: I79f74cdaf4c90ad71eb3f9b10a46027939fbffa7 CRs-Fixed: 811686
* | | | | | Merge "SnapdragonCamera: The alert dialog's rotation is not right"Linux Build Service Account2015-03-292-15/+89
|\ \ \ \ \ \
| * | | | | | SnapdragonCamera: The alert dialog's rotation is not rightlikaid2015-03-262-15/+89
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: don't hide count down title"Linux Build Service Account2015-03-270-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ 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: fix portrait orientation"Linux Build Service Account2015-03-260-0/+0
|\ \ \ \ \ \ \ \