summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SanpdragonCamera: Disable continuous shot for advanced capture"Linux Build Service Account2014-10-091-0/+3
|\
| * SanpdragonCamera: Disable continuous shot for advanced captureIvan Evlogiev2014-10-071-0/+3
| | | | | | | | | | | | - Continuous shot needs to be disabled for continuous capture Change-Id: Id83431cff69da778df8cf815731688e73505b0c3
* | SnapdragonCamera: Add support for CDS and TNR settingsDimitar Borisov2014-09-304-0/+130
|/ | | | | | | | | | | | | Add support for CDS and TNR settings - CDS and TNR can be controlled in photo mode and video mode. - CDS is set to off and cannot be set to other value when TNR is enabled - CDS value is restored when TNR is disabled again CRs-Fixed: 715042 Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
* SnapdragonCamera: Add HDR need 1x menu selectionIvan Evlogiev2014-09-113-3/+35
| | | | | | - HDR need 1x can be true (default) or false Change-Id: I184ad034d61165becb9fb95a0963e8e8c0752558
* Camera: Add support for video rotationApurva Rajguru2014-09-034-0/+49
| | | | | | Adding menu items for video rotation. Change-Id: Ic684dd279f6c2f867e607ba6fbe3919db67b96f8
* Camera: Modified 8M resolution entrySusmitha Gummalla2014-08-261-2/+2
| | | | | | | | -Modified 8M resolution to 3840 x 2160 -Moved square mode entry to appropriate location CRs-fixed: 714811 Change-Id: If2e5bf4fa1d1aeaca98bde8c3225bf91f1a438cc
* Merge "SnapdragonCamera: Set default HDR mode to multi-frame based"Linux Build Service Account2014-08-251-1/+1
|\
| * SnapdragonCamera: Set default HDR mode to multi-frame basedSunid Wilson2014-08-241-1/+1
| | | | | | | | | | | | Multi-frame HDR needs to be set as default for HDR scenemode Change-Id: I0f8398900d796126ceb888c500810746cb21705c
* | SnapdragonCamera: Add H265 encoderVladimir Petrov2014-08-222-0/+3
|/ | | | | | Add support for selecting the HEVC video encoder (H265). Change-Id: I3b7974eb333e0914047e9b5c96a0fb9d6f494b2a
* SnapdragonCamera: Change 13MP resolution to 4160x3120Ranjith Kagathi Ananda2014-08-211-1/+1
| | | | | | | Change the resolution corresponding to 13 MP option in the app to choose 4160x3120 instead of 4208x3120. Change-Id: I6e74bed1bb8fe25d4a451349f38bacf334d94572
* SnapdragonCamera: Add HDR mode menu selectionIvan Evlogiev2014-08-213-0/+32
| | | | | | - HDR mode can be sensor (default) or multi-frame Change-Id: I4513c52e9050d66e25d70ed8f484637dc75c6196
* SnapdragonCamera: Switch to SD card when internal storage is fullkaiyiz2014-08-211-0/+3
| | | | | | | | | | | | | | | | When internal storage is full, switch to SD card for storage. Change the save path from internal storage to SD card when updateStorageSpace is called if: 1. Internal storage is the current save path and does not have enough space 2. SD card has enough space Display a toast message and update display of the save path menu item when the storage path is switched. CRs-Fixed: 687210 Change-Id: I6a9804e4f64e6d55c6aebd889ac2ce5e887cfa5a
* SnapdragonCamera: Make panorama frame size configurableLikai Ding2014-08-211-0/+4
| | | | | | | | For low RAM devices, allow reduction of the panorama frame size to save memory via the 'panorama_frame_size_reduction' config option. Change-Id: I26b98699341d5eedfe2ebe8a6ed417fe62933bd5 CRs-Fixed: 669381
* SnapdragonCamera: Add support for adding square snapshot resolutionApurva Rajguru2014-08-182-0/+4
| | | | | | | Adding resolution corresponding to 1:1 aspect ratio in picture sizes. Change-Id: I8b86918b3777d47e54fa4517080b356d4bc327cc
* SnapdragonCamera: To enable 4kuhd on redfoxCherian Deepak2014-08-182-4/+8
| | | | | | | | On redfox 4kuhd was replaced by 2160p, so we need to add 2160p resolution to enable 4kuhd in UI Change-Id: Ib0b7acea65d60bd2e98b3aefc146e873ac351508
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-163-2/+3
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Camera2: Enhance KK cameraapp for LChiou-Hao Hsu2014-08-161-2/+2
| | | | | | Enhance KK cameraapp for L. Change-Id: If708b253f34a131d7842f8921e54c008283e0056
* Merge "Camera2: Update 4M wide picture size to be 16:9"Linux Build Service Account2014-07-251-1/+1
|\
| * Camera2: Update 4M wide picture size to be 16:9Gjorgji Rosikopulos2014-07-231-1/+1
| | | | | | | | | | | | | | | | All defined resolution should be with correct aspect ratio (16:9, 4:3). This change makes sure 4M wide picture size is 16:9. Change-Id: If5e1a8c3a2a353d130b2977b0b211bf61ec555f1
* | Merge "Camera2: add UI resources"Linux Build Service Account2014-07-18138-0/+0
|\ \
| * | Camera2: add UI resourcesLikai Ding2014-07-15138-0/+0
| |/ | | | | | | | | Icons for new UI design. Change-Id: I92a10414baf1bff8f6d55159b32a5426f85e600c
* | Merge "Camera2: Fix some settings are English when system language is Chinese"Linux Build Service Account2014-07-182-2/+19
|\ \
| * | Camera2: Fix some settings are English when system language is Chinesekaiyiz2014-07-092-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no matched Chinese resource for these settings. Add matched Chinese string resource for settings include AE-Bracket/ Advanced features/AUTO HDR. CRs-Fixed: 690387 Change-Id: Ia67d4ac7b1197d74409e7eaf98fc22f85280906b
* | | Merge "Camera2: optionally force count down sound"Linux Build Service Account2014-07-171-1/+2
|\ \ \
| * | | Camera2: optionally force count down soundLikai Ding2014-07-091-1/+2
| |/ / | | | | | | | | | | | | | | | | | | set count down sound as STREAM_SYSTEM_ENFORCED for carrier compliance Change-Id: Ie60bb4c7059ad8930be2c6650808107dcaaa22a2 CRs-Fixed: 684591
* / / Camera: Add HSR 60 and HSR 90 modesVijay kumar Tumati2014-07-162-8/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Adding 2 more modes 60 and 90 to HSR feature. HSR - High speed recording where video is recorded at the same fps at which camera is pumping frames. CRs-Fixed: 629713 Change-Id: I31a13f8d5db8c94be7bafb7506bafe268b764362
* | Merge "Camera2: fix more settings menu use the same icon"Linux Build Service Account2014-07-083-0/+0
|\ \ | |/ |/|
| * Camera2: fix more settings menu use the same iconkaiyiz2014-06-303-0/+0
| | | | | | | | | | | | | | | | | | | | There is only one icon fit this menu. Add new icons for this menu item and use them in videomenu and photomenu. CRs-Fixed: 634284 Change-Id: I277bd01910fd27508e50b5b1793e9e5f58e0c70f
* | Camera: Initial Refocus supportEmilian Peev2014-06-262-0/+5
|/ | | | | | | | | Refocus mode is enabled which expects 7 snapshots in burst from the camera. The captured images are stored with custom names. Change-Id: I7c1f9ef15d710118f7089c2fc584da450ab0984c
* Merge "Merge tag 'android-4.4.3_r1' into HEAD"Linux Build Service Account2014-06-2357-70/+71
|\
| * Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-1157-70/+71
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-201-2/+2
| | | | | | | | | | | | | | | Change-Id: I5f7c2232952457358858fc8d33d06c8c1de19efc Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-162-3/+3
| | | | | | | | | | | | | | | Change-Id: I8229ddd9cd55f6561be600469f38063e70480c0f Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-0950-100/+50
| | | | | | | | | | | | | | | Change-Id: I2b510d8650a4854a3066596e28cee9d4d196dd09 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEGeoff Mendal2013-12-0455-57/+107
| | | | | | | | | | | | | | | Change-Id: I108868d50a1376c9d638fae24f7a004733eedecb Auto-generated-cl: translation import
| | * Add another HTC picture resolutionMichael Kolb2013-12-022-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patching into Carlsbad branch from Bryce Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml
| | * Import translations. DO NOT MERGEGeoff Mendal2013-11-253-4/+4
| | | | | | | | | | | | | | | Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2013-11-2155-277/+387
| | | | | | | | | | | | | | | Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1 Auto-generated-cl: translation import
* | | Camera2: Check memory status when in longshot modeFei Zhang2014-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1> When memory can be used by application is smaller than 40MB, need cancel longshot. 2> When system memory is limited, need cancel longshot. 3> When longshot begin, also check the memory status. 4> The thresholds can be changed based on Customer requirement. CRs-fixed: 654291 Change-Id: I0d4688fe13c8c28a4fda4e9ac9c2257302201ae5
* | | Merge "Camera2: Adding support for Auto HDR"Linux Build Service Account2014-06-144-0/+33
|\ \ \ | |/ / |/| |
| * | Camera2: Adding support for Auto HDRAbhishek Pant2014-06-064-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 06:11:13 +0000