summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
Commit message (Collapse)AuthorAgeFilesLines
* camera: Touch focus support for camcorderSteve Kondik2015-09-201-0/+5
| | | | | | | | | * Available when video snapshots are not supported. * Original from CodeAurora Forum. Sultanxda: Adapted to Snapdragon Camera Change-Id: I232c178430db08e7366aa9f91b4926d07e7c225d
* Snap: Cleanup qcom string resourcesMichael Bestas2015-09-201-33/+0
| | | | | | | | | | | * Remove tons of unused strings * Make some strings shorter to fit better in the settings popup * 'Off' should be always the first option, else the app behaves unexpectedly * Use consistent strings for all on/off options * Replace string references to entryvalues for all qcom options with the actual parameters * Group arrays & strings based on the option Change-Id: I092ce765013e7a80a2928df8e7d1b7e7bfd67905
* Snap: Cleanup video profile handlingMichael Bestas2015-09-171-14/+28
| | | | | | | | | | | | | | * Fix camcorder crashes on older devices Revert "SnapdragonCamera: Fix compatibility issues with KK." This reverts commit 0d33346534a728a1f8efaec05fcdccbe3e5440e1. Revert "SnapdragonCamera: Throw error popup for unsupported video profile." This reverts commit 3e50703cff0bc243b922a2299c58a45a4cbd91a9. Change-Id: I1152180a590650a7583430936f3759d1831e91dd
* Snap: Add placeholder scene mode thumbnailsMichael Bestas2015-09-171-6/+45
| | | | | | * Fix crashes Change-Id: I4887af0a405079b4aa858c6bf57b14a7efb837c8
* Camera: Add red-eye flash mode supportMichael Bestas2015-09-171-0/+5
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I3db982732d15fb4eb83d5e37bff1a123225d4e8e
* camera: Add all resolutions, focus modes, scene modes, and color effects.Steve Kondik2015-09-171-34/+160
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* SnapdragonCamera: Fix reversed video flash mode buttonsSultanxda2015-09-171-4/+4
| | | | | | *Previously, setting the "off" option would enable flash, and setting the "on" option would disable it SnapdragonCamera: Fix reversed video flash-mode icons
* Revert "SnapdragonCamera: Modify snapcam per Lanix requirements"Gopal G Goberu2015-08-031-0/+68
| | | | | | This reverts commit 9718d52b226489ad60df5934fb86fed219330a91. Change-Id: I13fd76e075935013786165e6732b5d8e11b46132
* SnapdragonCamera: Modify snapcam per Lanix requirementsByunghun Jeon2015-07-141-68/+0
| | | | | | Provide required picture size/quality, and video resolution entries Change-Id: I165fa1c1af1996ab1b94ceb7dbf96be7478807a9
* Snapdragon: Add HDR to scene mode menuByunghun Jeon2015-03-171-1/+3
| | | | | | Add HDR as a scene mode to scene mode menu Change-Id: I0d6d9c87d09e72dd24f6d1a2e26fab91f7cb700e
* SnapdragonCamera: Fix icon display abnormal.likaid2015-02-101-1/+0
| | | | | | | | | One additional drawable data is defined in array. Delete the additional data. Change-Id: Ifd4a744f21a1d6add2c28d42ebf20e615202e2cc CRs-Fixed: 791684
* SnapdragonCamera: Add Portrait to scene modeByunghun Jeon2015-01-261-3/+5
| | | | | | | Add portrait option to scene mode Change-Id: I5c29e896734eab25e8f21adb142006081ea1c851 CRs-Fixed: 777753
* SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+3
| | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* SnapdragonCamera: Add HVGA (480x360) video quality.Sai Kumar Sanagavarapu2014-12-131-0/+2
| | | | | | Add support for HVGA (480x360) video quality in camcorder settings. Change-Id: I3fd2bf4c266f2068cbe83301184d421e9278928e
* Merge "SnapdragonCamera: Add 16MP and 20MP picture resolutions"Linux Build Service Account2014-12-011-0/+4
|\
| * SnapdragonCamera: Add 16MP and 20MP picture resolutionsShankar Ravi2014-11-181-0/+4
| | | | | | | | | | | | | | Adding 16MP and 20MP picture resolution support. Change-Id: Icaacd5d378e0361d5699d087ccbb17007c82cd3e
* | Merge "SnapdragonCamera: Fix compatibility issues with KK."Linux Build Service Account2014-11-271-25/+12
|\ \
| * | SnapdragonCamera: Fix compatibility issues with KK.Sai Kumar Sanagavarapu2014-11-261-25/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove openLegacy call to open camera. 2. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 3. Fix NPE during startpreview if mParameters is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
* | | SnapdragonCamera: Set 8MP resolution to 3264x2448.Sai Kumar Sanagavarapu2014-11-211-1/+1
|/ / | | | | | | | | | | Replace existing 8MP resolution 3200 x 2400 with 3264 x 2448. Change-Id: I9471a615c14d8732de80734c82ff33fc90c26390
* / SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-30/+28
|/ | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Merge "SnapdragonCamera: Add support for manual 3A params."Linux Build Service Account2014-11-091-1/+1
|\
| * SnapdragonCamera: Add support for manual 3A params.Sai Kumar Sanagavarapu2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Camera: Add support for video rotationApurva Rajguru2014-09-031-0/+22
| | | | | | 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
* 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 support for adding square snapshot resolutionApurva Rajguru2014-08-181-0/+2
| | | | | | | Adding resolution corresponding to 1:1 aspect ratio in picture sizes. Change-Id: I8b86918b3777d47e54fa4517080b356d4bc327cc
* SnapdragonCamera: To enable 4kuhd on redfoxCherian Deepak2014-08-181-4/+4
| | | | | | | | On redfox 4kuhd was replaced by 2160p, so we need to add 2160p resolution to enable 4kuhd in UI Change-Id: Ib0b7acea65d60bd2e98b3aefc146e873ac351508
* 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 tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | patching into Carlsbad branch from Bryce Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml
* | Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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 "Merge remote-tracking branch into merge_branch"Linux Build Service Account2013-12-071-4/+10
|\ \
| * | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-4/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add Samsung front camera resolutionsMichael Kolb2013-11-011-0/+10
| | | | | | | | | | | | | | | | | | | | | Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
| | * Update HDR/HDR+ arc menu hover messages.Sascha Haeberling2013-10-171-4/+4
| | | | | | | | | | | | | | | | | | Bug : 11185194 Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
* | | Merge "Camera2: Adding support for 4kx2k resolution"Linux Build Service Account2013-12-051-0/+6
|\ \ \
| * | | Camera2: Adding support for 4kx2k resolutionAbhishek Pant2013-12-041-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Adding support for 4kx2k resolution for camcorder in the app. Change-Id: Ib186c3464fe4d90f0c085a8a40ee5dd860034503 CRs-fixed: 578625
* / / Camera2: Fixed 13MP UI option not visibleAbhishek Pant2013-11-211-1/+1
|/ / | | | | | | | | | | | | | | Changed the 13mp resolution height and width in the app to match the one present in mct. Change-Id: I474b6a694674b6f515858a966add694063742d3a CRs-fixed: 575913
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* | Camera: Fix for focus mode option missing in camera settingsAlok Kediya2013-10-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | Also add "Normal" and "CAF" options under focus mode settings (cherrypicked from commit ce394a31d3ad72228861322ff8cf82e494ddf358) Change-Id: Id9168d43d92adf3e209896b2501f28d4a0f0293c (cherry picked from commit c207527c898023862063dac98e60da0490af27f1) (cherry picked from commit 631d0f1abe7447915bd6fd75308d523d7a734cfb) (cherry picked from commit 8ccaca55d0b6cd75321ab26f2781ae6f8c737270)
* | Camera: Add initial QCom value add features.Alok Kediya2013-10-311-7/+40
|/ | | | | | | | | | | | | | | - Enhance the camera picture size table by adding more number of supported resolutions. - Enhance the camcorder menu by adding support for additional video and audio codecs. - Also provide option to select the duration of the recording clip. (cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e) Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5 (cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17) (cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec) (cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
* Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-031-6/+6
| | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-031-2/+2
| | | | | | Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
* Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-241-0/+21
| | | | | | | Bug: 10430748 Bug: 10785988 Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
* Add HTC One picture resolutionsMichael Kolb2013-05-301-0/+4
| | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
* Add 13MP resolutionMichael Kolb2013-05-241-0/+2
| | | | | | Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
* Update scene mode off icon in menuMichael Kolb2013-05-011-1/+1
| | | | | | Bug: 8656593 Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc
* Add new indicatorsMichael Kolb2013-04-261-0/+8
| | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
* Fix labelsMichael Kolb2013-04-191-8/+18
| | | | | | Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a