summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Add missing Chinese resources.kaiyiz2014-06-041-0/+3
| | | | | | | | | | The toast message only define in English resources. Add Chinese strings for flash unsupport AE bracket message. CRs-fixed: 675100 Change-Id: I5d3fa7244e11bb52e9e3d3eff0827295c9c83e15
* Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-032-0/+4
|\
| * Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-282-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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
* | 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 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
* | | 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
* | 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
* Camera: Disable flash for AE-BracketSuman Mukherjee2014-05-221-0/+4
| | | | | | | | | | | | 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: 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: Disable HDR when scene mode is other than auto"Linux Build Service Account2014-05-081-0/+4
|\ \
| * | Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-04-291-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | - 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
* / Camera: Block HFR option for Video HDRSuman Mukherjee2014-04-231-1/+1
|/ | | | | | | | | | | | 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 "Camera: Disable DIS option for unsupported resolution"Linux Build Service Account2014-04-211-0/+3
|\
| * Camera: Disable DIS option for unsupported resolutionSuman Mukherjee2014-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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: I982e64f9f3a24c96e83484c6ce8cda3381139520 CRs-Fixed: 644268
* | Merge "Camera2: add UI option to on/off longshot"Linux Build Service Account2014-04-215-0/+25
|\ \ | |/ |/|
| * Camera2: add UI option to on/off longshotFei Zhang2014-04-145-0/+25
| | | | | | | | | | | | Add a menu option to turn on/off longshot. Change-Id: I21b5b8e8181317dc2db5ece44a60be66a52f5d0a
* | Merge "Camera2: fix the picture format not update problem"Linux Build Service Account2014-04-191-1/+1
|\ \ | |/ |/|
| * Camera2: fix the picture format not update problemKerong Sui2014-04-101-1/+1
| | | | | | | | | | | | | | | | When we set the ZSL on, the picture format should change to Jpeg immediately. So we override the setting menu. Change-Id: Ie24acf61667a7faa7603d8c3876bcba0ec0da5c2 CRs-fixed: 621806
* | Merge "Camera2: update the Chinese translation for some error message"Linux Build Service Account2014-04-111-0/+6
|\ \
| * | Camera2: update the Chinese translation for some error messageKerong Sui2014-04-091-0/+6
| |/ | | | | | | | | | | | | | | As customer required, we need to translate the error message to Chinese. We need these patch to pass such as CMCC test Change-Id: Ie06d254b2beb75899d5f72e065ca2b0b853d7a30 CRs-fixed: 622522
* | Merge "Camera: Block DIS and Timelapse for HFR"Linux Build Service Account2014-04-111-0/+3
|\ \
| * | Camera: Block DIS and Timelapse for HFRSuman Mukherjee2014-03-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I42ed3d3d20727ddda1b15c21b3ba85c8c41a82ef CRs-Fixed: 627373, 627362
* | | Merge "Camera2: Update white balance chinese translation"Linux Build Service Account2014-04-111-4/+4
|\ \ \
| * | | Camera2: Update white balance chinese translationShuai Yuan2014-04-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Update white balance chinese translation. Change-Id: If6ba29f68595d1bb6db880edadd50760c0e14161
* | | | Merge "Camera2: Disable AOST for non zsl"Linux Build Service Account2014-04-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2: Disable AOST for non zslIvan Evlogiev2014-04-011-1/+1
| |/ / | | | | | | | | | | | | | | | - Disable AOST features for non zsl Change-Id: I064f8e1be8a85576c5e4e9baa8ee29a2b40bd14e
* | | Merge "Camera2: translate some setting menu to Chinese"Linux Build Service Account2014-04-021-1/+184
|\ \ \ | |/ / |/| |
| * | Camera2: translate some setting menu to ChineseKerong Sui2014-03-311-1/+184
| |/ | | | | | | | | | | | | | | Some setting in kk branch have not translate to Chinese.This patch will translate them to Chinese which will improve the user's experience Change-Id: Ibe488d3e568d1c896c88aa7abb15a0df0d8e39c0 CRs-fixed: 622530
* / Camera2: Fix histogram cover the capture button issueliangche2014-03-271-1/+1
|/ | | | | | | | | The change increase the histogram layout marginLeft, then the histogram layout will not cover the capture button layout when camera in landscape mode. Crs-fixed: 622533 Change-Id: I58dc5518f6d96b759c352aea86e14b1acdccb1ea
* Merge "Camera: Rename DIS checkbox to IS"Linux Build Service Account2014-03-261-2/+2
|\
| * Camera: Rename DIS checkbox to ISEmilian Peev2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | Image stabilization will be extended to support DIS/EIS etc. In order to avoid any confusion the DIS checkbox needs to be renamed to the more general IS. Change-Id: I88357c5b47b38cccbf7a76ffdbe9c26047bace31
* | Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-274-0/+29
|/ | | | | | | | | | | | Add a feature to choose use SDcard or phone to store picture and video captured by camera and camcorder. Some of the changes are taken from: I987a691c93edc4250fe0366d0623c85ea0152117 CRs-Fixed: 619806 Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
* Merge "Camera2: Added pause button in Camcorder"Linux Build Service Account2014-02-1812-4/+52
|\
| * Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-2112-4/+52
| | | | | | | | | | | | | | | | | | - Added pause button in camcorder app.so that user pause recording and resume later which results in a single recorded clip. CRs-Fixed: 587051 Change-Id: I2a7d8af7fcea74fe8af62c44119c3c1fa0c13e85
* | Camera: Add support for high speed recordingVijay kumar Tumati2014-02-102-3/+13
| | | | | | | | | | | | | | | | | | To support 120fps recording without slow motion effect, these changes are needed. This enables 120 FPS for all resolutions if HSR is on. Change-Id: Iece5a382a80f4e3064880d26a29949705352b0e0
* | Camera2: Enable HDR for zsl modeEvgeniy Borisov2014-01-081-3/+0
|/ | | | | | HDR is now supported for zsl mode Change-Id: Ic9985e9f2ca6ffea3f33aef1f6f2949d4876c8d9
* Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."Linux Build Service Account2013-12-203-0/+42
|\
| * Camera: Add support for UbiFocus, ChromaFlash and OptiZoom.Ajit Singh Solanki2013-12-133-0/+42
| | | | | | | | | | | | | | | | | | - Add UI option in App to enable/disable UbiFocus, ChromaFlash and OptiZoom - App shows UI options for these features only when supported in HAL Change-Id: I924f97b2b510b351d9a8cb48a0aac6a4dc24ca10
* | Camera: Set the width dynamic to parent from fixed 400pxSuman Mukherjee2013-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | Width of the seekbar was 400px and that caused overflow for the rightmost text value. Set the width match_parent so that it'll change dynmaically with the text window. Change-Id: I51069d4c5687e72516bc4a5afc59f9f3ae6f8e88 CRs-fixed: 582325
* | Merge "Merge remote-tracking branch into merge_branch"Linux Build Service Account2013-12-0768-290/+462
|\ \
| * \ Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-0668-290/+462
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| | * Import translations. DO NOT MERGEBaligh Uddin2013-11-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I41cd8145da8f2907c6c5b20713a28f3e47791bcc Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2013-11-1155-390/+195
| | | | | | | | | | | | | | | Change-Id: I19829aa0316b38df602b026e39213f11ca02d4d9 Auto-generated-cl: translation import
| | * am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbadSascha Haeberling2013-11-071-0/+2
| | |\ | | | | | | | | | | | | | | | | * commit '2b78c0c048fe906beaeadeee3e267524c808c340': Add GCam progress indicator.
| | | * Add GCam progress indicator.Sascha Haeberling2013-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
| | * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-0755-239/+480
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 12:50:53 +0000