summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Port all string improvements from cm-14.1Michael Bestas2018-02-041-21/+17
| | | | | | * This is a mess Change-Id: I91b46d2e54c78f55b31fa8b45156d74ca05e8027
* CameraNext: dynamically generate available photo resolutionsWilhelm Fitzpatrick2018-01-261-37/+0
| | | | | | | | | | Instead of depending on a large matching table, generated the list of picture sizes to show to the user directly from the supported list returned by the camera. The list is filtered to remove uselessly small resolutions on modern devices, to group resolutions by aspect ratio, and to filter out fairly similar sizes. Change-Id: I47a67a89786543baec133cf7e71df9819793ebac
* Snap: Fix aapt warningsLars Greiss2018-01-261-0/+2
| | | | Change-Id: I6d48105f0407ded104244eb5ace4a3ace76eb402
* camera: Add all focus modes, scene modes, and color effects.Steve Kondik2018-01-261-13/+5
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* Snap: Use AOSP app labelMichael Bestas2018-01-261-1/+0
| | | | Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
* Snapdragon: Add bokeh enable options in devzhuw2018-01-031-0/+1
| | | | | | | | | | add bokeh enable options in dev. value: true->enable false->disable blur->enter int value Change-Id: I4e69a5371b60ce55dee2468634b1e14956811f22 CRs-Fixed: 2164757
* SnapdragonCamera: Add 8M pixels (16:9) for picture sizeweijiew2017-04-191-0/+1
| | | | | | | Add 8M pixels (16:9) for picture size Change-Id: I7ee1402843d0fb8d8fcce6e1cadfa9cea3751d2c CRs-Fixed: 2027214
* SnapdragonCamera:Fix The setting list and picture size aren't same as specpezhan2017-03-031-0/+2
| | | | | | | | | | | SettingActivity is short of action bar and prefenence title's size not the same as UI spec. Adjust prefenence title's size and style, add actionbar for SettingActivity. Change-Id: I17977f655a99ba087acaaa12232f05341c93471e CRs-Fixed: 1105206
* SnapdragonCamera:Fix [FR35432] BestPicture function lost.pezhan2017-01-111-0/+19
| | | | | | | | | | | | | | | | | | | | Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
* SnapdragonCamera: FR36364 Restore Defaultsweijiew2016-11-071-0/+4
| | | | | | | Restore all of the camera settings to defaults Change-Id: Icebc84a165a1fabee2075daa9b4e99695204cc19 CRs-Fixed: 1084321
* SnapdragonCamera: FrameListener and Video frame processorJack Yoo2016-07-071-0/+1
| | | | | | | | Adding FrameListener with TrackingFocus Adding VideoFrameProcessor with beautification Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43 CRs-Fixed: 1035245
* Minimum viable Android M runtime permissions handling for H.zafir2016-06-021-0/+6
| | | | | | | | | | | | | | | | | | Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb)
* SnapdragonCamera: Add 24 MP resolutionSampath Vangaveti2016-03-181-0/+2
| | | | | | | | Added 24MP resolution(5656x4242) to the UI CRs-Fixed: 982283 Change-Id: I18628d84d76cd5c77a7b96d9074381548800fe4b
* SnapdragonCamera: Disable NR when SeeMore is enabledJay Wang2016-02-191-0/+3
| | | | | | | | - Add condition to disable NR when SeeMore is enabled - Clean up the SeeMore conditional checking logic Change-Id: I191794c034e0c70818cee785516575d5642497ca CRs-Fixed: 972044
* SnapdragonCamera: Recording screen to be dynamicJack Yoo2016-02-061-0/+1
| | | | | | | | Let the recording rotate layout to be removed by default and added when it's needed. Change-Id: I2b910897956b914c150941276b299160e9147055 CRs-Fixed: 958510
* SnapdragonCamera: Moving Image Stabilization option to the menuCamera Software Integration2015-12-221-1/+1
| | | | | | | Moving Image Stabilization option to the menu Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b CRs-Fixed: 937237
* Merge "SnapdragonCamera: Add QHD and 2K video qualities."Linux Build Service Account2015-10-261-0/+4
|\
| * SnapdragonCamera: Add QHD and 2K video qualities.Sanjeev Garg2015-09-271-0/+4
| | | | | | | | | | | | | | Adding video qualities QHD (2560x1440) and 2K (2048x1080) Change-Id: Ie1500d61d2614a3cfd542f7a298c92a3208c4c7b
* | SnapdragonCamera: Add noise reduction modes.Neelam Abhinav Karthik2015-09-281-0/+6
|/ | | | | | - Add menu for noise reduction modes Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3
* SnapdragonCamera: Set default video resolution to 1080pJay Wang2015-09-031-1/+1
| | | | | | | Previously, default video recording resolution was largest available. This has been changed to be 1080p by default. Change-Id: I29b4d7d8d80af1472315fdacb9c1672403247f7f
* SnapdragonCamera: string changesLikai Ding2015-08-211-2/+2
| | | | | | Replace some strings with their official version. Change-Id: I6b6f3aea7b594c536f0cf7fccda882f4054fc52f
* SnapdragonCamera: Modify Settings titlesByunghun Jeon2015-07-151-5/+3
| | | | | | | Modify Setting title strings to improve user experience Change-Id: I9ed297dd895c6ed5ca3094af91342051e3496bbd CRs-Fixed: 869198
* SnapdragonCamera: Add 21 MP resolutionRajaram Gudivada2015-07-111-1/+1
| | | | | | | | | | 1) 20MP resolution mentioned in UI is 21MP and so corresponding name changed to 21MP 2) Also Corresponding resolution (5344x4016) is not exactly the 4:3 aspect ratio and so changed the height to 4008 to make exact 4:3 aspect ratio Change-Id: Idff3f28990a1daa6a6ba15f597a70e2468ae0697
* SnapdragonCamera: Add 16MP 16:9 picture resolutionRajaram Gudivada2015-07-021-0/+2
| | | | | | Add 16MP 16:9(5312x2988) to picture resolutions Change-Id: I8cb2816a3432d4e36d943fc9f4fdf866be7c628b
* SnapdragonCamera: implement optizoom and chromaflash UILikai Ding2015-05-271-0/+1
| | | | | | add scene mode for optizoom and preference entry for chromaflash Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
* SnapdragonCamera: add touch animation for refocusLikai Ding2015-04-271-2/+0
| | | | | | also added a dialog to explain refocus mode Change-Id: I8c319c2cb64ca85d320eca453ade9c325fd4ac37
* SnapdragonCamera: Customize camera video qualitylikaid2015-04-091-0/+2
| | | | | | | | | | | SnapdragonCamera's default video quality value was set to highest supported video resolution whitch was "720P" Add the default video quality value string "pref_video_quality_default" and overlay it to "VGA" CRs-Fixed: 815638 Change-Id: I5013880a42028e0663a3d22ffa3cddf87990146b
* SnapdragonCamera: Disable CDS and TNR if SeeMore is enabledShwetha Kotekar2015-03-101-0/+6
| | | | | | | If seeMore is enabled, send a disable command to HAL to disable the CDS and TNR features. Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003
* Camera2: Disable SeeMore feature during 4K videoShwetha Kotekar2015-03-101-0/+3
| | | | | | | If the video resoultion is 4K, disable SeeMore and show a toast message. Change-Id: Ica6d5cf0e24154556fcdf44df9172ca255fe030a
* SnapdragonCamera: Set highest supported video resolution by default.Sai Kumar Sanagavarapu2015-02-271-2/+0
| | | | | | | Instead of defaulting to CIF, set the highest supported video resolution as the default video profile. Change-Id: I6cb1eab905d193cbc03f528d0fbc81f5af49ab89
* SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+4
| | | | | | | | 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: show how many more pictures can be takenLikai Ding2014-12-221-0/+2
| | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* Merge "SnapdragonCamera: Add 16MP and 20MP picture resolutions"Linux Build Service Account2014-12-011-1/+4
|\
| * SnapdragonCamera: Add 16MP and 20MP picture resolutionsShankar Ravi2014-11-181-1/+4
| | | | | | | | | | | | | | Adding 16MP and 20MP picture resolution support. Change-Id: Icaacd5d378e0361d5699d087ccbb17007c82cd3e
* | SnapdragonCamera: Fix compatibility issues with KK.Sai Kumar Sanagavarapu2014-11-261-2/+2
| | | | | | | | | | | | | | | | | | 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: Update UI with new icons and setting menusByunghun Jeon2014-11-171-1/+1
|/ | | | | | Updating icons and settings menus for SnapdragonCamera UI Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
* 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
* SnapdragonCamera: IS is disabled when 4k video quality is enabledDimitar Borisov2014-10-141-0/+4
| | | | | | | - IS is disabled when 4k video quality is enabled CRs-Fixed: 733839 Change-Id: Iaaaa779bab0fbd7f9e5e5be08c6ada1c67ceb17a
* SanpdragonCamera: Disable continuous shot for advanced captureIvan Evlogiev2014-10-071-0/+3
| | | | | | - Continuous shot needs to be disabled for continuous capture Change-Id: Id83431cff69da778df8cf815731688e73505b0c3
* Camera: Add support for video rotationApurva Rajguru2014-09-031-0/+7
| | | | | | Adding menu items for video rotation. Change-Id: Ic684dd279f6c2f867e607ba6fbe3919db67b96f8
* 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