summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* Add color effect UI to indicator wheel.Wu-cheng Li2010-10-211-2/+0
| | | | Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a
* Add more settings control in control panel.Wu-cheng Li2010-10-141-1/+1
| | | | Change-Id: I6280f5bfbcc87fde2ae046b65a9f91fa620c88bc
* am 8980fa66: am d6e48e7e: Merge "Add party and candlelight scene modes." ↵Wu-cheng Li2010-10-131-0/+4
|\ | | | | | | | | | | | | | | | | into gingerbread Merge commit '8980fa66ef1a23a9a49f92189ab467431c4b747c' * commit '8980fa66ef1a23a9a49f92189ab467431c4b747c': Add party and candlelight scene modes.
| * Add party and candlelight scene modes.Wu-cheng Li2010-10-121-0/+4
| | | | | | | | | | bug:3088074 Change-Id: I65fdc5567e2845e82ade22d671c16dc5f77e3492
* | am 68ec33e8: Fix bug3082774, tweak "Restore defaults" setting stringRoy West2010-10-111-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '68ec33e8e5135f34c15dded4891f50517b4d7418' * commit '68ec33e8e5135f34c15dded4891f50517b4d7418': Fix bug3082774, tweak "Restore defaults" setting string
| * Fix bug3082774, tweak "Restore defaults" setting stringRoy West2010-10-101-1/+1
| | | | | | | | Change-Id: I2226c618ef246499155d30fd08b5444f52a9fea9
* | Add white balance setting UI for xlarge layout.Wu-cheng Li2010-10-111-0/+3
| | | | | | | | Change-Id: I9775aae56cdee41232e628ebbaa87f7749d7e61f
* | Add zoom picker for xlarge layout.Wu-cheng Li2010-10-061-0/+2
| | | | | | | | | | | | | | The zoom of on-screen controls is not created if zoom picker exists. Change-Id: I229108aa8bc3eac7175acec46e14240627c7da7c
* | Change VGA and QVGA to translatable=true.Wu-cheng Li2010-10-031-2/+2
| | | | | | | | | | | | Some other languages may still need to translate them. Change-Id: I7c115fd8a5aa535386e094958d418ae1ff476ab7
* | am 2c7cb1af: Add QVGA picture size and change VGA to translatable=false.Wu-cheng Li2010-10-021-1/+2
|\ \ | |/ | | | | | | | | | | Merge commit '2c7cb1af8f9f700bab1b263b004a1d4265400ea7' * commit '2c7cb1af8f9f700bab1b263b004a1d4265400ea7': Add QVGA picture size and change VGA to translatable=false.
| * Add QVGA picture size and change VGA to translatable=false.Wu-cheng Li2010-10-021-1/+2
| | | | | | | | | | bug:3051830 Change-Id: I53a58b1e289f3882bd073f2f8deb77a29a759456
* | am c94de55b: Merge "Split strings with SD card references into variations." ↵Eric Fischer2010-09-291-6/+16
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit 'c94de55be78d58f58d2668b00beedd9c9307e2bf' * commit 'c94de55be78d58f58d2668b00beedd9c9307e2bf': Split strings with SD card references into variations.
| * Split strings with SD card references into variations.Eric Fischer2010-09-291-6/+16
| | | | | | | | Change-Id: I4d3d731eb89c4c9c2b0b19aeb1a8f87826026ad2
* | am 0f0f3708: Add translatable="false" for pref_camera_id_default.Wu-cheng Li2010-09-171-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '0f0f37082b2f1517cf7c9a4dd6a9974a1933d82e' * commit '0f0f37082b2f1517cf7c9a4dd6a9974a1933d82e': Add translatable="false" for pref_camera_id_default.
| * Add translatable="false" for pref_camera_id_default.Wu-cheng Li2010-09-171-1/+1
| | | | | | | | | | bug:3013075 Change-Id: Id50bdb1cb8e1cd5750edb80102ac10aea43debe3
| * Add switch camera on-screen button. DO NOT MERGEWu-cheng Li2010-09-081-0/+2
| | | | | | | | Change-Id: I00895a9df69d2b29656075da1e03b1a1f684b107
* | Adding ui for setting frame capture interval.Nipun Kwatra2010-09-151-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently adding a bunch of discrete options for the user to choose from. - Modified BasicIndicator class to allow ListPreference as well as IconListPreference. - Modified addIndicator() in HeadUpDisplay to take ListPreference instead of IconListPreference. - Modified GpsIndicator::getIcon() to return BitmapTexture instead of ResourceTexture as its base class BasicIndicator does the same now. - Fixed default value of time lapse quality. Change-Id: I9f01d8c77e9a803219c4661e10731fabbecf65a9
* | Adding 480p resources.Nipun Kwatra2010-09-131-0/+2
| | | | | | | | | | | | Adding resources for the 480p resolution. Change-Id: I455a541d950607123eed3dbe20f25d3054bc18cb
* | Add switch camera on-screen button.Wu-cheng Li2010-09-081-0/+2
| | | | | | | | Change-Id: I1564fdf0f7f70f15278bdbdee6d9b5c8a6e683e0
* | am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbreadWu-cheng Li2010-09-021-6/+0
|\ \ | |/ | | | | | | | | | | Merge commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58' * commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58': Remove quick capture UI. It is not used.
| * Remove quick capture UI. It is not used.Wu-cheng Li2010-09-011-6/+0
| | | | | | | | Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
* | am 454c6838: Remove metering mode support.Wu-cheng Li2010-08-301-11/+0
|\ \ | |/ | | | | | | | | | | Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda' * commit '454c6838bb220142d05fbd6f1858ba31cc034eda': Remove metering mode support.
| * Remove metering mode support.Wu-cheng Li2010-08-301-11/+0
| | | | | | | | Change-Id: I624f611e19c438630bc84778332d13f0357da23f
* | resolved conflicts for merge of e2c02932 to masterWu-cheng Li2010-08-271-0/+8
|\ \ | |/ | | | | Change-Id: Ie1ad37bf4cf70a70a5b21e4ec9513cf5244e101c
| * Add camera selection setting strings.Wu-cheng Li2010-08-261-0/+8
| | | | | | | | Change-Id: I1cebf6c926c4b475e2d66894f748c2c6861937d8
* | Adding descriptions, character limits to strings for translation.Nipun Kwatra2010-08-191-8/+13
| | | | | | | | | | | | | | | | Also removed pref_camcorder_time_lapse_settings_category string which wasn't used. bug: 2930870 Change-Id: I925a776bff0dafe87f4fde4d4fbe65e01c825057
* | Added support for time lapse video capture.Nipun Kwatra2010-08-101-0/+17
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in individual files: VideoCamera.java: - Added swith to time lapse option in Menu. - initializeHeadUpDisplay(): sets up display according to the current mode (timelapse/no timelapse). - readTimeLapseVideoPreferences(): sets parameters according to the chosen quality. Eventually this should move to CamcorderProfile through media_profiles.xml files. - switchTimeLapseMode(): handles switching between time lapse mode normal mode. - Since preview size may be different from video size for HD time lapse capture, we save the desired preview size in mDesiredPreviewWidth, mDesiredPreviewHeight and use it for comparison in resetCameraParameters(). - Time lapse mode is enabled/disabled by calling mMediaRecorder.setTimeLapseParameters(). CamcorderHeadUpDisplay.java: Constructor now takes in a boolean (captureTimeLapse) telling whether to enable time lapse quality options or the normal camcorder quality options. Camera.java: Moved getOptimalPreviewSize() to Util.java to enable use from VideoCamera.java. Also needed to pass activity, so that can use getWindowManager(), getSystemService(). CameraSettings.java: added support for time lapse parameters. The function getVideoTimeLapseQuality() returns the quality identifier from the passed in string. res/: added string, array values for time lapse. res/xml/video_time_lapse_preferences.xml: contains all the preferences for time lapse mode. Change-Id: I194e7bc0b6218aa742d91c859a122de2b953a314
* Support switching between multiple cameras.Chih-Chung Chang2010-06-231-0/+3
| | | | Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
* Add metering mode support.Wu-cheng Li2010-06-111-1/+12
| | | | Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
* Show better message to users if camera fails to access sdcard.Wu-cheng Li2010-05-281-3/+6
| | | | | | | Also print the exception if sdcard access fails. bug:2713104 Change-Id: I35a553ee75a49398582b587755d097b02b144015
* Remove unused resources and code.Owen Lin2010-04-071-44/+0
| | | | Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
* Add switch to Camera/VideoCamera menu item.Chih-Chung Chang2010-03-151-0/+2
| | | | | Bug: 2249997 Change-Id: I14434fb5c617a62e02eaace120157c4a9d32e681
* New UI for camcorder.Owen Lin2010-03-141-23/+1
| | | | Change-Id: Id35564836da7b4051662cccfd0920480421499b0
* Add the new ZoomController UI and also the exposure compensation settings.Owen Lin2010-03-101-0/+1
| | | | | | | | | Fix the bug that some MotionEvent of some actions should always pass to the component who accept the DOWN event. Also fix a bug that nine patch image will be drawn incorrectly after rotation. Change-Id: I8ab36fb6f958c1967afa11eed5f167842b59cada
* Add strings for for new UI.Owen Lin2010-03-051-12/+30
| | | | Change-Id: I0b398d87f3526a70c45a607efbd7823185e53d64
* Remove unused resources.Chih-Chung Chang2010-02-221-12/+0
|
* Remove unused strings.Chih-Chung Chang2010-02-191-32/+0
|
* Add quick capture settings for Camera application.Owen Lin2010-01-251-0/+6
| | | | | Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b Bug: 2259528
* Add restore default settings for Camera/Camcorder app.Owen Lin2010-01-211-0/+8
| | | | | Bug: 2167010 Change-Id: I1b59ddd23ee9a3b9cc34f911c048e269fb872cf8
* Add flash light setting in video camera.Wu-cheng Li2009-12-081-0/+3
| | | | http://b/2118298
* Add one more picture size settings.Owen Lin2009-11-271-0/+1
| | | | | | We need small size for the fake camera in emulator. Change-Id: I5543936338813d575efc158c78e219da7feb9415
* Camera: Clean up the image/video file naming codePetri Gynther2009-11-251-1/+4
| | | | | | | | | | | | | | | | | | | | 1) Create 'image_file_name_format' string in strings.xml 2) Change createName() routines in Camera.java and VideoCamera.java to use 'image_file_name_format' and 'video_file_name_format', respectively. 3) Change image filenames on SD card to format: IMG_yyyyMMdd_HHmmss.jpg -- e.g. IMG_20091020_120000.jpg (Old format was 'yyyy-MM-dd HH.mm.ss.jpg' which contained undesirable space character in the filename.) 4) Similarly, change video filenames to format: VID_yyyyMMdd_HHmmss.3gp -- e.g. VID_20091020_120000.3gp (Old format was 'video-yyyy-MM-dd-HH-mm-ss.3gp' which was not consistent with the image filename format.)
* resolved conflicts for merge of 503560f0 to eclair-mr2Owen Lin2009-11-201-0/+3
|\ | | | | | | Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
| * Keep space for those empty icons but hide them if the feature is notOwen Lin2009-11-201-0/+3
| | | | | | | | | | | | | | | | supported. fix bug: http://b/2250438 Change-Id: I79eb9d575cf275c25decc6236b80f61ecfdf3042
* | am 3e44f807: Use "Use My Location" settings to decide wheather we store the ↵Owen Lin2009-11-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | picture\'s location. Merge commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2 * commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f': Use "Use My Location" settings to decide wheather we store the picture's location.
| * Use "Use My Location" settings to decide wheather we store the picture's ↵Owen Lin2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | location. However, if user has specifically assign the "Record Location" we will follow the settings. Bug: http://b/2265010 Change-Id: I4863d299b8f461ee73c8aeb4651740855efe3dbd
* | am 01ed85fb: Merge change Ic823abd0 into eclairChih-Chung Chang2009-11-091-2/+3
|\ \ | |/ | | | | | | | | | | Merge commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0' into eclair-mr2 * commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0': Fix 2241232: Read system properties for quality setting.
| * Fix 2241232: Read system properties for quality setting.Chih-Chung Chang2009-11-091-2/+3
| | | | | | | | Change-Id: Ic823abd0c352b3eca0b8ef504307bd1de7d1700f
* | Remove some more code.Owen Lin2009-11-041-18/+0
| | | | | | | | Change-Id: I5779a15fcffecd9de28e6e1c24a59d3cf0a523f7
* | remove unused resource files and elementsOwen Lin2009-10-291-254/+0
|/ | | | Change-Id: Ia4e7b9724501c0a1c5c16008390e0116bb409c14
generated by cgit v1.1 at 2025-02-09 17:16:01 +0000