summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* 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-0/+4
| | | | | | | | 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 tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+1
| | | | | | | | | | | | | | | | | | | | | | patching into Carlsbad branch from Bryce Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml
* | 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
* | Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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/+9
|\ \
| * | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-4/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'capturing' string for in process indicatorsAlan Newberger2013-11-051-0/+3
| | | | | | | | | | | | | | | | | | | | | This string can be used for in progess screen indicators. Bug: 11505806 Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
| | * Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbadAlan Newberger2013-11-041-4/+4
| | |\
| | | * Adjust HDR options menu detailsAlan Newberger2013-11-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To better align HDR/HDR+ menu options with other menu options, shortening the description and making it all caps. Bug: 11481286 Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
| | * | Add Samsung front camera resolutionsMichael Kolb2013-11-011-0/+2
| | |/ | | | | | | | | | | | | | | | | | | Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
* | / Camera2: Adding support for 4kx2k resolutionAbhishek Pant2013-12-041-0/+8
|/ / | | | | | | | | | | | | | | Adding support for 4kx2k resolution for camcorder in the app. Change-Id: Ib186c3464fe4d90f0c085a8a40ee5dd860034503 CRs-fixed: 578625
* / Camera: Add initial QCom value add features.Alok Kediya2013-10-311-6/+4
|/ | | | | | | | | | | | | | | - 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)
* am c13cc22b: Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
|\ | | | | | | | | * commit 'c13cc22ba17591111be3fae732ae0396e889820a': Add strings to better describe HDR mode menus
| * Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
| | | | | | | | | | | | | | | | Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'. Leaving existing strings to pipeline translations before implementing the migration to these strings. Bug: 11185194 Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
* | Fix build break.Sameer Padala2013-10-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ag/369626/ added a cannot_load_image string which was translated in ag/370960/ However, this translation resulted in a duplicate string since this string already existed in translated versions of filtershow_strings.xml which was deleted in ag/339346 but the translated versions weren't deleted. Deleting all the translated versions of that file caused a problem because ag/362583/ added source code that depended on a setting_wallpaper string which only existed in the translated string files. This change deletes the translated filtershow_strings.xml and adds the untranslated setting_wallpaper string. Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934 (cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
* | am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbadSascha Haeberling2013-10-071-4/+4
|\| | | | | | | | | * commit '94f5f216821c1090bd8a0660483935456dc13df1': Increase character limit.
| * Increase character limit.Sascha Haeberling2013-10-071-4/+4
| | | | | | | | | | | | | | | | Bug: 10999205 Bug: 10558260 Bug: 10554875 Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b
| * Fix missing filtershow string. DO NOT MERGESascha Haeberling2013-10-071-0/+3
|/ | | | | | Bug: 11116778 Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56
* Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-031-2/+2
| | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-031-4/+2
| | | | | | Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
* Add missing crop message.Sascha Haeberling2013-10-031-1/+2
| | | | | | Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
* Merge "Increase char limit for camera timer sound message." into ↵Sascha Haeberling2013-10-021-1/+1
|\ | | | | | | gb-ub-photos-carlsbad
| * Increase char limit for camera timer sound message.Sascha Haeberling2013-10-011-1/+1
| | | | | | | | | | | | Bug: 10962439 Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e
* | Add content description to post-capture thumbnail.Sascha Haeberling2013-10-011-0/+3
|/ | | | | | Bug: 10916138 Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652
* Use Camcorder label and icon for video camera activity.Mangesh Ghiware2013-09-251-0/+2
| | | | | Bug: 10932790 Change-Id: If8847e06049e63116381904382db7dfcebb55010
* Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-241-0/+3
| | | | | | | Bug: 10430748 Bug: 10785988 Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
* Add crop activitynicolasroard2013-09-191-0/+5
| | | | | | bug:10367125 Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
* Adding gcam module to Camera2 app.Ruben Brunk2013-09-181-0/+2
| | | | | | Bug: 10430748 Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
* Fix various message issuesSascha Haeberling2013-09-181-13/+19
| | | | | | | | | | Bug: 10568697 Bug: 10589224 Bug: 10561095 Bug: 10589353 Bug: 10570925 Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf
* Add HQ and HD strings.Sascha Haeberling2013-09-161-0/+4
| | | | | | Bug: 10785988 Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43
* Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-121-0/+10
| | | | | | | | | Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
* Re-add a strings that should not have cleaned up.Sascha Haeberling2013-09-061-0/+14
| | | | | | Bug: 10647548 Change-Id: I7b99a82a0748ed8ec8d5b288e8f1ed62d77d10ac
* Remove unused strings.Sascha Haeberling2013-09-051-480/+0
| | | | | | Bug: 10627919 Change-Id: I5434baf8785912a577fec9f363598e4d927fddc3
* Increase char limit.Sascha Haeberling2013-09-041-1/+1
| | | | | | Bug: 10590844 Change-Id: Ib30d348c1806e5c1b174bdd5198b880a2dca14e5
* Rename renering message from panorama to photo sphere.Sascha Haeberling2013-08-301-2/+2
| | | | | | Bug: 7695145 Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
* Use the well-translated camera_label instead of app_name.Sascha Haeberling2013-08-271-1/+0
| | | | | | Bug: 10509953 Change-Id: Ia5522fce1892e521c12fcc2f152afe7009026ac5
* Remove Refocus string and iconSascha Haeberling2013-08-261-2/+0
| | | | | | Bug: 10494566 Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
* Remove the "button" part of the shutter button description.Sascha Haeberling2013-08-201-1/+1
| | | | | | | | Bug: 10081355 Talkback automatically appends "button" to a clickable ImageView. Change-Id: I7d20b96965a5542277cb27b0fd8d255251b2cb3c
* Rename accessibility text for Photo Sphere mode from 'new panorama'.Sascha Haeberling2013-08-191-2/+2
| | | | | | Bug: 10075811 Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
* Remove old video camera icon and label from Camera2Doris Liu2013-08-131-3/+0
| | | | | Bug: 10296343 Change-Id: I6c6f130f86b4206d6b9ef322c76e6bdbe81aa57e
* Update app name to "Camera" before merging to KLP.Sascha Haeberling2013-08-121-4/+1
| | | | Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-1/+2
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Refocus integration phase 1.Sascha Haeberling2013-07-241-0/+2
| | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
* Fix help for GalleryGoogle buildsJohn Reck2013-07-171-3/+0
| | | | | | Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
* 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
* Rename scenemode AUTO to NONEMichael Kolb2013-04-191-1/+1
| | | | | | Bug: 8660834 Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:49:08 +0000