summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix NPE when only front cameras are available.Angus Kong2012-06-131-10/+3
| | | | | bug:6643208 Change-Id: Ie4eef4a671091cd9557d1c51ab5c3919b6b30652
* Show video snapshot toast in first use.Chih-yu Huang2011-10-281-1/+2
| | | | | bug:5494290 Change-Id: I7cb498ef50610d300a64d9d053b0a411d86da730
* Fix the bug that local preference is not reset.Angus Kong2011-09-261-15/+8
| | | | | bug:5366049 Change-Id: Ifee52c43c7c2ec8ff674fca8ce7762cc489c1b6a
* Restrict effects to 480p.Eino-Ville Talvala2011-09-231-3/+11
| | | | | | | | - Preview stretching still occurs after some transitions. - Correct quality used in recording, shown in UI at all times. Bug: 5320425 Change-Id: I63612c55d2e6e0e979208c59f2caf9a61ac1d3f8
* Show the real resolution for quality settings.Angus Kong2011-09-231-52/+36
| | | | | | | | | | 1. Change the assets. 2. Change the strings from high/low/mms to 1080p/720p/480p. 3. Change the preference from customized string to the real values of CamcorderProfile.QUALITY_[1080|720|480]P bug:5141068 Change-Id: I294799bda8e873f828bbf4bd21330591f0859632
* Add video recording with effects into Camera.Eino-Ville Talvala2011-09-061-1/+70
| | | | | | | | | Initial support for video recording in the Camera app, with the goofyface and background replacement effects. Bug: 5212166 Change-Id: I30995e305c202ba57bf76ff18c885bf16c5ea14f
* Add goofy face effect setting UI.Wu-cheng Li2011-08-281-0/+3
| | | | | | | | The functionality is not working yet. bug:5226051 Change-Id: Icb684d9320688f90ea0856b97424f9bfb6c47f39
* Add exposure indicator on screen.Chih-yu Huang2011-08-221-0/+11
| | | | | bug:5141528 Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5
* Add tap to focus toast.Wu-cheng Li2011-08-151-0/+1
| | | | | bug:5039278 Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a
* Remove focus mode setting if tap-to-focus is possible.Wu-cheng Li2011-08-141-2/+7
| | | | | bug:5141526 Change-Id: I947721209ffbcb3eb6f443cb503f80871031a0bf
* Remove color effects to simplify UI.Wu-cheng Li2011-08-101-6/+0
| | | | | bug:5141303 Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
* Pass camera id while getting camcorder profile.Wu-cheng Li2011-05-061-20/+8
| | | | | | | | | | This also prevents NPE during variable initialization if camera module fails to load. When camera module fails to load, CamcorderProfile.get(int) will return null. bug:4381780 Change-Id: I14a9af9e6f172cd02ef6df11ed81f1655361618a
* Fix settings are not retained when we toggle from still & video mode.Wu-cheng Li2011-02-281-0/+4
| | | | | | | | | | "Restore defaults" clears the preferences of both cameras. Previously the preferences variable was incorrectly pointed to the preferences of front camera after restore defaults. After that, any camera setting change were written to the front camera even if the current camera is back camera. bug:3417946 Change-Id: I675ccd20bfdf9d44e53e90238c410228b55ee376
* Remove 0.25s and 0.5s from time lapse recording.Wu-cheng Li2011-01-181-0/+7
| | | | | | | | Software encoder needs more than 0.25s to encode a frame. Besides, we will add arc shaped indicator and it looks bad with 0.25s and 0.5s. Change-Id: Ic54748d91d91ad7fcc4701ede6cf1e07af73ecfb
* Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference.Wu-cheng Li2011-01-181-7/+0
| | | | Change-Id: Ib00968c41b89733594725d2e921da2b8e4158a97
* Increase the resolution of video quality low.Chung-yih Wang2010-12-271-12/+8
| | | | | bug:3287017 Change-Id: I7b3d814eecad5555690e1afca6e038ca43e44aeb
* Remove the 30-minute limitation of video length.Wu-cheng Li2010-12-171-5/+2
| | | | | | New devices do not have this limitation anymore. Change-Id: I48e30c55a5375b6926c861c5d2f2466f54e87ea9
* Change youtube video limit from 10min to 15min.Wu-cheng Li2010-12-161-2/+2
| | | | | bug:3287031 Change-Id: I92ea46c9e3940d2537fcc89b02395928671c89f5
* Remove mms quality if the device does not support voice.Wu-cheng Li2010-12-131-12/+27
| | | | | bug:3272846 Change-Id: Ic573e790d323e93c9976e9985308890031d26a0b
* Add restore default in other settings.Wu-cheng Li2010-12-081-16/+31
| | | | | | Also change the theme to Holo. bug:3156672 Change-Id: Ied6f2d3543c3a3282c62b2cc31e5cf4cc30c3172
* resolved conflicts for merge of 79769585 to masterJean-Baptiste Queru2010-12-071-3/+0
|\ | | | | | | Change-Id: I8e78a4e4bd1dbd8f7f48196107ab78c915244e6e
| * resolved conflicts for merge of cdd3e6fe to stage-korg-masterJean-Baptiste Queru2010-12-071-3/+0
| |\ | | | | | | | | | Change-Id: I7f5844e0bb9a46cd8948b830712efdbc596a49f7
| | * code cleanup: unused import statements, local varaiables and ... removed ↵Mohammad Shamsi2010-11-061-3/+0
| | | | | | | | | | | | | | | | | | from Camera app Change-Id: I6480b49bffa898400b2f2f3eeea85ce3bceed457
* | | Add front/back camera switchChung-yih Wang2010-11-251-22/+23
| | | | | | | | | | | | | | | bug:3156676 Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
* | | am c309fcde: am 35c8657f: Merge "Remove ↵Wu-cheng Li2010-11-081-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread * commit 'c309fcde67648ae483cab117a956ce11cf065ffd': Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
| * | Remove android.hardware.Camera.CAMERA_ID_DEFAULT.Wu-cheng Li2010-11-081-2/+1
| | | | | | | | | | | | | | | bug:3173302 Change-Id: I2141456f3577e504e173a46efdbb343e03aaa5f5
* | | am bfc24ed9: am cec28d72: Merge "Do not show the setting if there is only ↵Wu-cheng Li2010-10-131-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | one supported option." into gingerbread Merge commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1' * commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1': Do not show the setting if there is only one supported option.
| * | Do not show the setting if there is only one supported option.Wu-cheng Li2010-10-121-0/+4
| | | | | | | | | | | | | | | bug:3064986 Change-Id: I1d3a8cff955d203c2a055ee596f30035001a5c63
* | | Pass camera id to CamcorderProfile.hasProfile.Wu-cheng Li2010-10-031-8/+11
| | | | | | | | | | | | | | | | | | | | | In the future, android.hardware.Camera.Parameters should have a getCameraId. It is easier for apps to know which camera it is now. Change-Id: Iae529c02d89b64a9158a0bdc4b4d0cfd293e7270
* | | am c97d2382: Update the code due to API change.Wu-cheng Li2010-09-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c97d23826a28dd725951eccb62651244f9fb8228' * commit 'c97d23826a28dd725951eccb62651244f9fb8228': Update the code due to API change.
| * | Update the code due to API change.Wu-cheng Li2010-09-151-1/+1
| | | | | | | | | | | | | | | | | | bug:3001395 bug:3001399 Change-Id: Ie1347ed28aa72a3ec637867dc2226c60ef2dbd6c
| * | Add switch camera on-screen button. DO NOT MERGEWu-cheng Li2010-09-081-8/+45
| | | | | | | | | | | | Change-Id: I00895a9df69d2b29656075da1e03b1a1f684b107
* | | Adding ui for setting frame capture interval.Nipun Kwatra2010-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Filter out unsupported time lapse resolutions.Nipun Kwatra2010-09-131-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Filtering out unsupported resolutions. - Added getSupportedTimeLapseProfiles() to find the list of supported time lapse profiles. - added CamcorderProfile quality level values to the pref_video_time_lapse_quality_entryvalues in arrays.xml - removed getVideoTimeLapseQuality as can use the quality values directly. - Use the newly added time lapse profiles for setting resolution values. Change-Id: I0776a38e0a9bd19fff772878869e1c0504aadc8d
* | | Add switch camera on-screen button.Wu-cheng Li2010-09-081-8/+45
| | | | | | | | | | | | Change-Id: I1564fdf0f7f70f15278bdbdee6d9b5c8a6e683e0
* | | am 4714a1cf: Use SharedPreferences.apply to reduce latency.Wu-cheng Li2010-09-081-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0' * commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0': Use SharedPreferences$Editor.apply to reduce latency.
| * | Use SharedPreferences$Editor.apply to reduce latency.Wu-cheng Li2010-09-081-4/+4
| | | | | | | | | | | | | | | | | | Replace all commit with apply. bug:2978683 Change-Id: I6c057fab588aada7c35d03f6237fb850d2a2e856
* | | am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbreadWu-cheng Li2010-09-021-4/+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-4/+0
| | | | | | | | | | | | Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
* | | am 454c6838: Remove metering mode support.Wu-cheng Li2010-08-301-7/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda' * commit '454c6838bb220142d05fbd6f1858ba31cc034eda': Remove metering mode support.
| * | Remove metering mode support.Wu-cheng Li2010-08-301-7/+0
| | | | | | | | | | | | Change-Id: I624f611e19c438630bc84778332d13f0357da23f
* | | Added support for time lapse video capture.Nipun Kwatra2010-08-101-0/+26
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 multiple camera preferences.Chih-Chung Chang2010-06-231-10/+28
| | | | | | | | Change-Id: I7c8440424c472c9ff61ac22692ce60234d359efe
* | Support switching between multiple cameras.Chih-Chung Chang2010-06-231-0/+14
| | | | | | | | Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
* | Add metering mode support.Wu-cheng Li2010-06-111-0/+7
|/ | | | Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
* Avoid loading drawables in CameraSettings.Owen Lin2010-04-261-25/+1
| | | | | | Bug: 2430326 Change-Id: Ia5e6f4320fac3a89ede5054e9ac7b6f31c973273
* Camera app update due to CameraProfile and CamcorderProfile API changesJames Dong2010-03-311-1/+1
| | | | | | | | | | | Also, make the quality level mapping from String to numeric number less fragile. Dependency: https://android-git.corp.google.com/g/#change,47310 bug - 2553862 Change-Id: I50606a16bd9d377f5002bc784a9dcc7b9f8c1486
* More improvement on UI.Owen Lin2010-03-181-0/+2
| | | | | | | 1. Disable on-screen settings while video/camera is acting. 2. Reset exposure in onResume() Change-Id: I4a58ae9c1a2ecff6d3f504de48e2504c8d86c1f3
* Fix several UI issues.Owen Lin2010-03-161-2/+6
| | | | | | | | | | | 1. Remove the cross in border_last_picture 2. Remove the gripper in VideoCamera 3. Solve the popup triangle locate in wrong position 4. Remove the top and bottom borders of the preview frame in Camera 5. Rotate the on-screen indicators when orientation changed 6. Add the checking for the flash mode in VideoCamera Change-Id: I304ea3582d08c5e46ed750b7371588635a4d8009
* New UI for camcorder.Owen Lin2010-03-141-15/+44
| | | | Change-Id: Id35564836da7b4051662cccfd0920480421499b0
generated by cgit v1.1 at 2024-06-10 20:41:50 +0000