summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Camera: Add support for video rotationApurva Rajguru2014-09-033-0/+43
| | | | | | 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-212-0/+25
| | | | | | - 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-161-0/+1
| | | | | | | | 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
* 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: Fix some settings are English when system language is Chinese"Linux Build Service Account2014-07-181-1/+1
|\ \
| * | Camera2: Fix some settings are English when system language is Chinesekaiyiz2014-07-091-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | 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
* 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-232-3/+4
|\
| * Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-112-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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
* | | 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
* | | Camera2: Adding support for Auto HDRAbhishek Pant2014-06-062-0/+21
|/ / | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-031-0/+3
|\ \
| * | Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
* | | 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
* | 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 "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-212-0/+15
|\ \ \ | |/ / |/| |
| * | Camera2: add UI option to on/off longshotFei Zhang2014-04-142-0/+15
| | | | | | | | | | | | | | | | | | 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 "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
* / / Camera2: Disable AOST for non zslIvan Evlogiev2014-04-011-1/+1
|/ / | | | | | | | | | | - Disable AOST features for non zsl Change-Id: I064f8e1be8a85576c5e4e9baa8ee29a2b40bd14e
* | 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-272-0/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | 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-181-1/+1
|\ \
| * | Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-202-0/+36
|\ \