summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0Brint E. Kriebel2014-11-182-12/+33
|\
| * Camera2: Allow devices to opt-out of threaded camera startupChristopher R. Palmer2014-11-142-12/+33
| | | | | | | | | | | | | | | | | | On at least the current Exynos based devices, the vendor's HAL appears to be unable to handle the threaded startup. Since we cannot easily fix their HAL, allow these devices to opt out of the faster camera startup. Change-Id: I8d1935eb69bb8ba1396b59d92993062637654258
| * Automatic translation importMichael Bestas2014-11-1050-165/+155
| | | | | | | | Change-Id: Ie12d13900b286655881295c7aade95e72eefaeb8
* | Automatic translation importMichael Bestas2014-11-1050-165/+155
| | | | | | | | | | Change-Id: Ie12d13900b286655881295c7aade95e72eefaeb8 (cherry picked from commit 7ae0cf0b9a2d0f41889599806d8a977a43c8362a)
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-11-03114-2205/+2507
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: res/values-az/cm_strings.xml res/values-in/cm_strings.xml res/values-it/cm_strings.xml res/values-iw/cm_strings.xml res/values-ku/qcomstrings.xml res/values-nb/cm_strings.xml res/values-pl/cm_strings.xml res/values-sk/cm_strings.xml res/values-th/cm_strings.xml res/values/qcomarrays.xml res/values/qcomstrings.xml Change-Id: Ib4294c621052fdd02ba3ab715deda052432d2fd0
| * Revert "camera: add support for samsung and htc camcorder modes"Michael Bestas2014-10-295-44/+0
| | | | | | | | | | | | | | | | * This is moved to the device specific camera wrappers This reverts commit e43890784fd08ac92de08691c7c6ba545c7ecb80. Change-Id: I74ac0654ccf1e04cbb69e2fa8a2a651990b484a9
| * Camera2: Remove CAF video duration codeMichael Bestas2014-10-295-68/+1
| | | | | | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
| * Camera: Don't enable shutterdown for count down timerSuman Mukherjee2014-10-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | For count down timer case, capture process should take place after timer expiry. Otherwise flash is getting turned ON immediately after pressing shutter button and then again during capture. Fix made by not allowing to do anything related to capture process except turning timer ON. Change-Id: I843c88ccc9c03235dc6a2a7638221c778bfc6551 CRs-Fixed: 623445
| * Camera: Decrease downsample factor for smaller resolutionSuman Mukherjee2014-10-292-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | After image capture, animation takes place with a downsampled image (by factor 4). Due to downsampling smaller resolution (QCIF and others) image size for animated thumbnail is going below the allocated size and it appeared very small. Fix: For image size of resolution CIF downwards, use downsampling factor as 2 without affecting performance for other resolution. Change-Id: I1098fc1a8f6fb880d5c36ebd2eaeec4415c75fe1 CRs-Fixed: 662891
| * Camera2: enable WNR in video modeLikai Ding2014-10-291-0/+6
| | | | | | | | | | | | | | Enable WNR to reduce noise in 720P recording preview. Change-Id: I74471446b5fba0216b292f8fca81bf6e09b5d997 CRs-Fixed: 669247
| * Camera: cancel auto focus after snapshot done if in CAF mode.Kerong Sui2014-10-291-0/+4
| | | | | | | | | | | | | | | | When snapshot in CAF mode, CAF will be locked and update focus status. Application needs call cancelAutoFocus() to resume CAF after snapshot, otherwise CAF will keep in lock state. Change-Id: I2aa3965e407d01efa9dd38b1cb840404390f29ce
| * Camera2: enable antibanding when dis is enableGaoxiang Chen2014-10-281-0/+18
| | | | | | | | | | | | | | | | banding will seriously impact DIS algorithm, so we need to set anti-banding to auto when DIS is enabled. Change-Id: I5ce9e907c68be803b35a929659fc1a9e0ac78642 CRs-fixed: 619074
| * Camera2: fix sawtooth in camera previewLikai Ding2014-10-282-16/+8
| | | | | | | | | | | | | | | | | | | | Under certain combination of preview/screen resolution, sawtooth is seen on preview image. In setTransformMatrix(), scaledTextureWidth/Height is unnecessarily rounded to integers, losing precision. Removing the rounding fixes the problem. CRs-Fixed: 705322 Change-Id: Ia78b012cf530528b3677a8684279862a81b145ed
| * Camera2: Make menu not pop up in take picture interfacekaiyiz2014-10-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | When we click menu key in view interface and take picture interface,the menu will both pop up. Modify condition to achieve not pop up menu in take picture interface. CRs-fixed: 652961 Change-Id: Ifc2e3b4535fdf48c110673a3ec633ecdc93cc37a
| * Automatic translation importMichael Bestas2014-10-2865-307/+310
| | | | | | | | Change-Id: I392a4e2fd9f2ed6451bfa87cb859ef20c5667293
| * Camera2: correct image size recorded in media provider dbLikai Ding2014-10-284-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Photos taken in camcorder can't be previewed on PC via MTP mode. The root cause is that, the actual image file size does not always match the _size column in media provider database. During the saving process, EXIF data are rewritten, but the size sent to media provider is not updated accordingly. Record bytes written in ExifOutputStream and OrderedDataOutputStream so that after rewritting, the correct image size could be sent to media provider. Change-Id: I74d91e86d712c121eb50daecaf879ab4f5be97fc CRs-Fixed: 711522
| * Camera2: fix camera has stopped" after long press camera keykaiyiz2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | When Long press camera key to open camera, mRootView has not been created in photoModule.init. mRootView must be created before using it. CRs-Fixed: 725790 Change-Id: I70cd4ac911c79a15c52d47147414bf1fcee65b53
| * Camera2: Fix crash on cameras with 6mp 16:9 resolutionArne Coucheron2014-10-241-1/+1
| | | | | | | | Change-Id: I54c8a8245905cc7dc5e09fac6a3edf55f839f4f9
| * Add 16:9 to stringsjumoog2014-10-212-14/+14
| | | | | | | | | | | | | | | | | | | | to calc this you can use this: "=(A1/GCD(A1;B1))&":"&(B1/GCD(A1;B1))" in LibreOffice Change-Id: If298c91ad6c2e7ca8228bb9dda788ebe18e7f30f
| * Camera2: disable the shutter button when not previewingLikai Ding2014-10-211-0/+1
| | | | | | | | | | | | | | | | | | Camera app will crash if the shutter button is clicked while not previewing. Disable the shutter button in onStopPreview() as it's called by onSurfaceTextureDestroyed(). Change-Id: Ied369610c590323b977b4ac1c3150c6c905e9466 CRs-Fixed: 669190
| * Camera2: the menu button should not visible in some casesKerong Sui2014-10-211-0/+2
| | | | | | | | | | | | | | | | | | When we start camcorder from other activity, we touch home key, then back to the activity, this button will cover with the save button.The patch will fix this issue Change-Id: I74dc5f556d2a30af651d53b39c2bb4397a59884e CRs-fixed: 633613
| * Camera2: fix flash light turn on after resume camera activitykaiyiz2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If user choose an app to open video, onResume will be called after the choose dialog is dismiss. The function opencamera will be called and the value mPreviewFocused will be set true, which lead to flash light turn on when setCameraParameters. The value mPreviewFocused won't be true if not in Camera Preview, we can use the visible of mCameraControls to judge. CRs-Fixed: 680450 Change-Id: Ia04ae0fb77f05fb991e5262f86cbe6f308db7709
| * camera2: Fix memory leak when suspend/resume cameraFei Zhang2014-10-201-0/+2
| | | | | | | | | | | | Clear Overrides Map when init, to prevent memory leak. Change-Id: Iaca466f91fb7dc6273b03c2f148439fb1795b1d6
| * Camera2: Add option to set max screen brightnessMichael Bestas2014-10-2010-3/+54
| | | | | | | | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
| * Camera2: add new mime type for panorama pictureFei Zhang2014-10-201-1/+3
| | | | | | | | | | | | | | Add mime type 'image/jpeg', along with 'jpeg', So the DISPLAY_NAME of captured picture is correctly saved. Change-Id: I40a3c660311f1a3c69078ae3580dd74def9d69ba
| * Camera2: save the picture when rotate the deviceKerong Sui2014-10-201-1/+3
| | | | | | | | | | | | | | | | | | If we rotate the device, the panoroma can not mosaic image, so if we rotate the device, we should stop capture immediately and save the previous capture frames. Change-Id: I4ba304957d4083b4ae58c084239d6dc3d7f4dc89 CRs-fixed: 627105
| * Camera2: wait for previous saving picture done during panorama captureFei Zhang2014-10-201-1/+1
| | | | | | | | | | | | | | | | If saving pano picture thread is still running during onResume, we need to wait until it completes. CRs-fixed: 637244 Change-Id: I9ae5cb75a930421325d2e7d4d1b30306c867c6cf
| * Camera2: some aapt warnings cleanupLars Greiss2014-10-203-68/+0
| | | | | | | | | | | | | | during the move from Gallery2 into new Camera2 package some unused values were moved as well. Remove them Change-Id: I4a514c76ccc70c61bb0a97ecafda7e1f9ede9f35
| * Camera2: fix white balance still work when turn on the HDR modekaiyiz2014-10-202-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on target : 8916 Tested on Branch : kk Tested on AU \ tip : AU_LINUX_ANDROID_LNX.LA.3.7.1.04.04.03.031.203 Test case Verified : Yes CR Moved to Fix : Yes R notes filled : Yes DC set : Yes LOST approved (if new file \ feature added): Yes Voted on required Trunk : NA App need clear the whitebalance effect when set scene mode not auto, but the value getWhiteBalance still is not auto when change scene mode. So set white balance auto value forcely when scene mode is not auto. CRs-Fixed: 685240 Change-Id: Ib94b9cb1f3cc0c8ef63412ef75d65359ba797f37
| * Fix WB indicator overrideMichael Kolb2014-10-201-3/+6
| | | | | | | | | | | | | | | | Patching into Carlsbad from Bryce. Bug: 9372794 Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
| * Revert "Camera2: Fix WB onScreenIndicator when some are settings filtered out."Michael Bestas2014-10-202-34/+1
| | | | | | | | | | | | | | | | * This is obsolete with the new WB mode picker and the AOSP fix This reverts commit ede1eb17b2e36bfc867ba85877f686674d682d0e. Change-Id: I77b89278276b67c7ae329e14b56ca3800aa98f42
| * Camera2: fix The flashlight still is on after set scene mode not autokaiyiz2014-10-201-4/+5
| | | | | | | | | | | | | | | | | | | | | | If we set flash mode is on when scene mode is auto, the flash mode won't be reset when change to other scenemode and still is on. Set the flash mode is auto when scene mode is not auto. CRs-Fixed: 678466 Change-Id: If3874c03dc70297326b6cd7dcceb1f4efde85956
| * Camera2: update the flash icon when set HDR onKerong Sui2014-10-201-0/+2
| | | | | | | | | | | | | | | | When HDR is on the flash mode should be set to off. And the icon should be show as off too Change-Id: I2cca985694e8a5a8058d6bf5467d5375514acfab CRs-fixed: 645595
| * Camera: Block HFR option for Video HDRSuman Mukherjee2014-10-202-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Video HDR can’t work with HFR and that caused AEC behaviour change. Fix Made: User'll be notified that HFR/HSR selection is not allowed for HDR mode. After that, HFR selection will be set to off and the option will be disabled. It'll not be vice versa as HDR has higher priority than HFR. [mikeioannina]: Removed HSR code Change-Id: I4b0f8362667a53e46a83223cab77b7248e1410e2 CRs-Fixed: 652078
| * Camera: Disable DIS option for unsupported resolutionSuman Mukherjee2014-10-202-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | DIS will not work for unsupported resolution. If user'll start recording with DIS alongwith 720p resolution using front camera, then it'll crash. Fix: Block in UI, so that user'll not be able to select DIS with unsupported resolution after intimating through toasts. Change-Id: Ie788d456a7b15061f16a44ca34ccd3d1e6d90071 CRs-Fixed: 644268
| * Camera: Block DIS and Timelapse for HFRSuman Mukherjee2014-10-202-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DIS and Timelapse is not supported for HFR scenario. If user'll start recording with timelapse or DIS with HFR then crash observed from lower layer. Fix Made: User'll be notified that HFR/HSR selection is not allowed for TimeLapse and/ DIS mode. After that, HFR selection will be set to off and the option will be disabled. It'll not be vice versa as DIS/TimeLapse has higher priority than HFR for their existance in primary popup rather than being in secondary. [mikeioannina]: removed HSR code Change-Id: I42ed3d3d20727ddda1b15c21b3ba85c8c41a82ef CRs-Fixed: 627373, 627362
| * Camera: Check if codec supports HFR resolution/fps.Sai Kumar Sanagavarapu2014-10-201-0/+24
| | | | | | | | | | | | | | | | Some codecs can have limitation on the max HFR fps and video size combination. So, query the video encoder capabilites first and report error if codec doesnt support the combination. Change-Id: Ic2032176067a6f92d1363471d1a767d5ef589591
| * Camera: Change video capture duration with HFRSuman Mukherjee2014-10-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capturing a video with HFR, duration is getting stored properly in metadata but not in media database. While checking details, duration is showing actual captured duration, not the playback duration. After rebooting the phone, then media table is getting updated with proper duration. Fix made: After capture, change duration value as per user selected HFR option. CRs-Fixed: 627354 Change-Id: Ifb7c607e3545c4d2a2e0b1b7666cb0567640d416
| * Camera2: Fix ANR when switching camera during AFVladimir Petrov2014-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | - Check that 'mCameraDevice' is valid at beginning of setCameraParameters(). This will avoid null pointer exceptions at some cases, when setCameraParameters() is called by focus manager after closing camera. CRs-Fixed: 668405 Change-Id: Iff4b81e725db6db11cdc205512b0fec1f71f333d
| * camera: Override color effect when scene mode is activeSteve Kondik2014-10-201-4/+6
| | | | | | | | Change-Id: Ia27ed59f3f27e9c867cbb4c8823abb78b0035047
| * Camera2: fix unresponsive shutter button after failureLikai Ding2014-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | Shutter button is disabled during capture(). It's only re-enabled in onPicutreTaken() callback. If camera is switched just before counting down finishes, picture taking may fail and shutter button is left disabled. Enabling shutter button in onPreviewStarted() fixes the problem. Change-Id: I92c644e9a0d283f9ab0269b85586f27e0f4eeb1b CRs-Fixed: 667311
| * Camera2: Don't report incorrect supported picture formatsLars Greiss2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | If camera HAL does not return valid picture formats do not show wrong defaults Currently it falls back to jpeg and raw to choose for the user. All our devices which do not have a proper return of picture format only support jpg. So remove the entry to choose in this case completely Change-Id: Ib4e4094ba0a57e7751f6568f6ec3c3f1dfc1ffb8
| * Camera2: fix camera crash when mPieRender is nullkaiyiz2014-10-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | The autofocus maybe called before onCameraOpened, and mPieRender is not initialize which lead to camera crash. Check null when show focus ui. CRs-Fixed: 712850 Change-Id: If3d51c8ea31f4a755e26fe4730e85428373e6446
| * Camera2: Fix video duration is wrong issueliangche2014-10-201-1/+6
| | | | | | | | | | | | | | | | When mMediaRecorderPausing is true, video duration is equal to mRecordingTotalTime, which can fix video duration is wrong issue if use pause/resume. Change-Id: I71d41414bba11564cfe84166fbc18608636a73d1
| * Camera2: fix a camera status bugLikai Ding2014-10-201-2/+5
| | | | | | | | | | | | | | | | | | After a picture is taken for MMS app, the preview has been stopped in onPictureTaken() but the camera state is subsequently set to IDLE in ZSL mode. Add a check before assignment. Change-Id: I0610a58dbccffdba4b94140d74942c2ff60c7882 CRs-Fixed: 675176
| * Camera2: Do not restart preview to update flip params during orientation change.kaiyiz2014-10-202-45/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | When there was a orientation change flip paramter had to be changed. Currently all parameters are set again and preview is being restarted. so preview will not be smooth when user rotae the device. This change makes sure only necessary params are updated and preview will not be restarted. CRs-Fixed: 710129 Change-Id: I564431ef8cedaf68c9d12e2a84a3a430c845ab6d
| * Camera2: fix start preview when hdr is on issueKerong Sui2014-10-201-1/+2
| | | | | | | | | | | | | | | | | | when we have already set hdr on and do not set off, we don't need to set it to scene mode to auto every time. This will make the camerea to start preview again, which will make the app freeze for a while. Change-Id: Ica77106b88056e289cd298eda4ccc5c3f4f6ab59 CRs-Fixed: 679200
| * Camera2: Still popup tips when change scene to other after turn off HDRkaiyiz2014-10-201-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The toast popup or not depend on the value of hdr and scene mode, but now the value mHdrOn status is not uniform with the actual hdr value, which lead to popup toast incorrect. Get the value of scene mode or hdr from the preference directly rather than a new variable. So the mHdrOn is not used and delete it. CRs-Fixed: 674521 Change-Id: I1c6926e0ba295e9869109b7412a7413323d3bd1c
| * Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-10-203-0/+19
| | | | | | | | | | | | | | | | | | | | | | - HDR option is enabled even when scene mode is not auto. Due to this preview and snapshot are still remain in previous scene mode after enabling HDR. - Fix is to disable the HDR when scene mode is other than auto. Change-Id: Icec96816a7ed6f3daacc8b79841dee5db6b4b04a CRs-Fixed: 648847
| * Camera: open Camera and start Preview in a seperate thread.Sai Kumar Sanagavarapu2014-10-204-57/+107
| | | | | | | | | | | | | | | | Start openCamera and start preview in a separate thread so that UI initialization and preview can run parallely. This is to improve camera cold start latency. Change-Id: I57af45bc90a4db1630c73449d543c3ff0992e55c
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 19:51:30 +0000