summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-1737-150/+952
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Merge "SnapdragonCamera: Add support for manual 3A params."Linux Build Service Account2014-11-095-2/+97
|\
| * SnapdragonCamera: Add support for manual 3A params.Sai Kumar Sanagavarapu2014-11-075-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add UI support to take inputs from user for the following 3A paramters 1. Manual focus : a. Scale mode 0-100 b. Diopter mode 0-10 2.White balance: a. CCT b. RGB gains 3. Exposure control a. ISO b. exposure time Change-Id: I92ea3719fa2224e02943bb2191987c7654aaf9ea
* | Reorder flash setting array entry values.Santhosh Kumar H E2014-11-061-1/+1
|/ | | | | | | | | | | In the flashmode entry values array, torch value was at 0th position and off at 1st postion. So when user set flash mode to off, element at index 1 was chosen. But custom checkbox logic enables or disables checkbox based on index of array elements. Because of this checkbox was representing reverse values. So changing the order of array entry values. Change-Id: If9ae3d73b479de34fee88bb5ea9e6189b9b22ba1
* Camera2: Add Multi-touch UI and control in apps.Santhosh Kumar Thimmanna Bhattar2014-10-272-0/+5
| | | | | | Changes to support multi-touch focus feature in application Change-Id: I3dc0f3bf5cd71554856a00795e82d52f36066eeb
* Camera2: Add FSSR in Advanced features menu.Santhosh Kumar Thimmanna Bhattar2014-10-272-0/+5
| | | | | | | 1.Add FSSR option in Advanced features menu. 2.Query supported FSSR modes and enable FSSR. Change-Id: I40b9c7875483d022a1561b17aeb90d2e4cb789ce
* Camera2: Add See More feature in the menuSanthosh Kumar Thimmanna Bhattar2014-10-273-0/+31
| | | | | | - User can select See More feature in video mode. Change-Id: I13636846cce67caeb6eb0b3e073399fdae2be471
* Camera2: Add TruePortrait in Advanced features menu.Sai Kumar Sanagavarapu2014-10-272-0/+5
| | | | | | | 1.Add TruePortrait option in Advanced features menu. 2.Query supported TruePortrait modes and enable TP. Change-Id: I3e9bd54ab8e495eabb591bd380cf0553715e938a
* Merge "Camera: Enable ZSL by default"Linux Build Service Account2014-10-211-1/+1
|\
| * Camera: Enable ZSL by defaultSanthosh Kumar H E2014-10-131-1/+1
| | | | | | | | | | | | | | | | We need to enable the zsl mode by default, instead of non-zsl mode Change-Id: I2d1753c1884a9c136520b58a67bf33d7671134f0 CRs-Fixed: 626157
* | Merge "Camera2: Disable advance features when continuous shot mode is enabled"Linux Build Service Account2014-10-181-0/+8
|\ \
| * | Camera2: Disable advance features when continuous shot mode is enabledSanthosh Kumar Thimmanna Bhattar2014-10-151-0/+8
| |/ | | | | | | | | | | | | | | | | - Camera is getting stoppped in continuous shot mode when advance feature like ubifocus is enabled. - Fix is to disable advance features when continuous shot mode is enabled and vice versa Change-Id: Icc47dfd8a3d617b46794ae8abfd02e72b8e0b682
* / SnapdragonCamera: IS is disabled when 4k video quality is enabledDimitar Borisov2014-10-143-2/+9
|/ | | | | | | - IS is disabled when 4k video quality is enabled CRs-Fixed: 733839 Change-Id: Iaaaa779bab0fbd7f9e5e5be08c6ada1c67ceb17a
* 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