summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera2: Make menu not pop up in take picture interface"Linux Build Service Account2014-06-051-3/+1
|\
| * Camera2: Make menu not pop up in take picture interfacekaiyiz2014-05-271-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
* | Merge "Camera2: Query support for longshot and ZSL+HDR from parameters."Linux Build Service Account2014-06-047-2/+64
|\ \
| * | Camera2: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-027-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* | | Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-034-1/+19
|\ \ \ | |/ / |/| |
| * | Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-284-1/+19
| |/ | | | | | | | | | | | | | | | | | | | | The HDR function can not existed with the Continuous Shot function,so change code to achieve the function like that when we open HDR function ,make the Continuous Shot off, and we close HDR,make the Continuous Shot on. CRs-fixed: 667319 Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
* | Merge "Camera2: Add some missing Chinese resources."Linux Build Service Account2014-06-011-0/+4
|\ \
| * | Camera2: Add some missing Chinese resources.kaiyiz2014-05-281-0/+4
| |/ | | | | | | | | | | | | | | | | | | The toast message only define in English resources. Add Chinese strings for HFR/HSR/DIS unsupport message. CRs-fixed: 671766 Change-Id: Icc74a54379b917b6ca3c7cb9ffda0c0e262397cf
* | Merge "Camera2: disable ZSL setting during counting down"Linux Build Service Account2014-06-012-2/+4
|\ \
| * | Camera2: disable ZSL setting during counting downLikai Ding2014-05-292-2/+4
| |/ | | | | | | | | | | | | | | During counting down, ZSL setting should not be changed by user. Add check in popup initialization as well. Change-Id: I02439aef78adaa190158452ea034fa19256f9d85 CRs-Fixed: 664691
* | Merge "Camera2: Fix redeye reduction show abnormal when change language"Linux Build Service Account2014-06-011-2/+2
|\ \
| * | Camera2: Fix redeye reduction show abnormal when change languagekaiyiz2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xml resource is defined reversely which cause this bug happen Change the order of resource. CRs-fixed: 671820 Change-Id: I0d0895fe2117ce1bcc9e52029d021741496313da
* | | Merge "Camera2: fix flashlight widget status error after luanch camera"Linux Build Service Account2014-06-011-0/+8
|\ \ \
| * | | Camera2: fix flashlight widget status error after luanch camerakaiyiz2014-05-281-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flashlight will be initialized when we luanch camera.But flashlight widget do not know the flashlight has been turned off.So the widget's status still in turn-on. Send a broadcast to make flashlight widget know that flashlight has been closed.So the status can be right. CRs-Fixed: 670735 Change-Id: I8a6b7f49111071f23bc55c6d61b01a38d807cb57
* | | Merge "Camera2: fix unresponsive shutter button after failure"Linux Build Service Account2014-05-291-0/+1
|\ \ \
| * | | Camera2: fix unresponsive shutter button after failureLikai Ding2014-05-291-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
* | | Merge "Camera: Do not continue with long shot if SD card is full"Linux Build Service Account2014-05-291-0/+7
|\ \ \ | |_|/ |/| |
| * | Camera: Do not continue with long shot if SD card is fullVijay kumar Tumati2014-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | | We should not try to capture photos if SD card is full Change-Id: Iebbf5b100c5bb1a82a1016419eda7fd7bcab4c1b
* | | Merge "Camera2: Fix Histogram display adverse in Chinese mode"Linux Build Service Account2014-05-291-2/+2
|\ \ \
| * | | Camera2: Fix Histogram display adverse in Chinese modekaiyiz2014-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resource is defined adverse in xml file. Reset the array resource. CRs-fixed: 653545 Change-Id: I569c766e376f85af29c5d4a9360b8ccb52e7adc1
* | | | Merge "Camera2: avoid histogram covering shutter button."Linux Build Service Account2014-05-291-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2: avoid histogram covering shutter button.Likai Ding2014-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Histogram covers shutter button when the phone is rotated 90 or 180 degrees. Move it a little nearer to the center. Change-Id: I85b187c95b9cf9ef680765042b9679a9e58577ee CRs-Fixed: 657271
* | | | Merge "Camera2: Change picture format to Jpeg when start from other APK"Linux Build Service Account2014-05-261-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Camera2: Change picture format to Jpeg when start from other APKkaiyiz2014-05-251-0/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change menu setting of picture format to Jpeg when camera is start from other APK by intent. Crs-fixed: 662134 Change-Id: Ida20f278b5010b24d67a00c8631543f4b5b343c9
* | | Merge "Camera2: Add some missing Chinese resources"Linux Build Service Account2014-05-261-0/+4
|\ \ \ | |/ / |/| |
| * | Camera2: Add some missing Chinese resourceskaiyiz2014-05-261-0/+4
|/ / | | | | | | | | | | | | | | | | | | The toast message only define in English resources. Add Chinese strings for hdr_enable_message and scene_enable_message. CRs-fixed: 665366 Change-Id: Ib034c6e41a4cb300961a67f604ddd95cfa04b4dd
* | Merge "Camera: Disable flash for AE-Bracket"Linux Build Service Account2014-05-243-0/+30
|\ \
| * | Camera: Disable flash for AE-BracketSuman Mukherjee2014-05-223-0/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | The main flash is high, AE bracketing requires several frames. If the LED lit up at high for long, it could be burned and cause HW damge. Fix: Flash has been disabled if AE-Bracket option is enabled with proper toast message. CRs-Fixed: 663613 Change-Id: Ic568630783309af19f7670aee563cd6eb0032fb1
* | Merge "Camera2: Fix face eyes display incorrect when face detection is on"Linux Build Service Account2014-05-231-16/+50
|\ \ | |/ |/|
| * Camera2: Fix face eyes display incorrect when face detection is onkaiyiz2014-05-201-16/+50
| | | | | | | | | | | | | | | | | | | | | | There is no difference to the eye display when in horizontal screen and vertical screen. Add operations to display eyes line in horizontal screen. CRs-fixed: 637286 Change-Id: I5337fec876b3d868de9f3ba2f1b60a54810d8226
* | Merge "Camera: Send long shot UI button status to native drivers."Linux Build Service Account2014-05-211-0/+5
|\ \
| * | Camera: Send long shot UI button status to native drivers.Vijay kumar Tumati2014-05-141-0/+5
| | | | | | | | | | | | | | | | | | | | | Need to send long shot UI button status to native code to take actions appropriately. Change-Id: I8cf56f09fa33ee31ae7eb2f687d07d875e5ae6fc
* | | Merge "Camera: Decrease downsample factor for smaller resolution"Linux Build Service Account2014-05-212-2/+13
|\ \ \ | |_|/ |/| |
| * | Camera: Decrease downsample factor for smaller resolutionSuman Mukherjee2014-05-142-2/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Camera2: update the Chinese translation for some menu"Linux Build Service Account2014-05-171-8/+10
|\ \
| * | Camera2: update the Chinese translation for some menuKerong Sui2014-04-291-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | As customer required, we need to translate some menu to Chinese. In order to pass the CMCC test Change-Id: I22c218493d8a4256109115b6a64c39c86adef894 CRs-fixed: 654580
* | | Merge "Camera: Update JPEG picture format to HAL when ZSL mode is turned on"Linux Build Service Account2014-05-161-0/+1
|\ \ \ | |_|/ |/| |
| * | Camera: Update JPEG picture format to HAL when ZSL mode is turned onVijay kumar Tumati2014-05-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without this, picture format is changed to JPEG in UI but this message is not conveyed to HAL. Change-Id: I287a684c7bb89f02f8b7c8597a8157afaf0a4da6
* | | Merge "Camera: Disable HDR when scene mode is other than auto"Linux Build Service Account2014-05-083-0/+19
|\ \ \ | |/ / |/| |
| * | Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-04-293-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: I6f75f3c686d79757c464deaeca495de767bdabb0 CRs-Fixed: 648847
* | Merge "Camera2: Fix camera application memory leak"Linux Build Service Account2014-05-075-10/+31
|\ \
| * | Camera2: Fix camera application memory leakGaoxiang Chen2014-04-245-10/+31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This change fix potential memory leak of camera application when swith between camera and panorama: 1. free allocated frames in jni/Mosaic 2. use application context instead of acitivity context 3. clear disappearing children of ViewGroup explicitly 4. remove IdleHandler during camera exit CRs-fixed: 622518 Change-Id: I2583709489ab2cf1fc20865fe7d2a8f56f2763c9
* | Merge "Camera2: disable ZSL setiing when in counting down"Linux Build Service Account2014-05-021-0/+3
|\ \
| * | Camera2: disable ZSL setiing when in counting downKerong Sui2014-04-281-0/+3
| |/ | | | | | | | | | | | | | | | | When we touch the button and snapshot using time counting down. we should not enable and disable the ZSL frequently. So disable the menu when in counting down Change-Id: I38ed28506fe33d784518c28767359eed41af9b74 CRs-fixed: 653607
* | Merge "Camera: Block HFR option for Video HDR"Linux Build Service Account2014-05-012-4/+7
|\ \ | |/ |/|
| * Camera: Block HFR option for Video HDRSuman Mukherjee2014-04-232-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. Change-Id: I4b0f8362667a53e46a83223cab77b7248e1410e2 CRs-Fixed: 652078
* Merge "Camera2: enable antibanding when dis is enable"Linux Build Service Account2014-04-211-0/+18
|\
| * Camera2: enable antibanding when dis is enableGaoxiang Chen2014-04-141-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
* | Merge "Camera2: dismiss all popups during camera exiting"Linux Build Service Account2014-04-212-4/+13
|\ \
| * | Camera2: dismiss all popups during camera exitingGaoxiang Chen2014-04-142-4/+13
| |/ | | | | | | | | | | | | | | If home key is pressed when UI is showing second level popup menu, it should dismiss all popup menu, instead of back to top level menu. Change-Id: I4678ebf875833e577d610c0aba856da5eaade982 CRs-fixed: 622519
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 05:31:23 +0000