summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Add more menu options/iconsMichael Kolb2013-04-181-4/+30
| | | | | | | | | Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
* First part of asset dropMichael Kolb2013-04-171-4/+4
| | | | | | | | Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
* Add menu labelsMichael Kolb2013-04-151-0/+35
| | | | | | Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
* Copy camera resources into Gallery2Michael Kolb2013-01-291-0/+404
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 22:48:31 +0000