4d226d16bb06861527e5ec162e39d9673e23df83 |
|
22-Feb-2012 |
akahuang <akahuang@google.com> |
Fix lint warnings. Fix warning: ObsoleteLayoutParam, FloatMath, IconDuplicatesConfig, UselessParent. bug:6047024 Change-Id: Id33a00e497acb276cd1cec8076f77e2fd4a0876e
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
71e88239cee734b1153839ba9d744a244c0be602 |
|
22-Dec-2011 |
Wu-cheng Li <wuchengli@google.com> |
Revert "Track users behaviour in Camera app." This reverts commit 862dc9ba03a2619fcbf8713103317ca5207e409a.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
862dc9ba03a2619fcbf8713103317ca5207e409a |
|
15-Dec-2011 |
Chih-yu Huang <akahuang@google.com> |
Track users behaviour in Camera app. At the first time, a confirmation dialog would appear. In Camera: Track settings when capturing photos and usage of share popup. In Video: Track setting about video effect, time lapse, and video quality. In Panorama: Track saving picture or discard, length of picture. bug:4293199 Change-Id: Ie1d289bc2e2c7520db1ccdf4e07b7f55554cfb85
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
40ffd9c0f81e20a482ca6832a8585ac5232370bf |
|
05-Dec-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5685507: Handle the case if a webcam is removed (in emulator). Change-Id: I485ade5c7f957d2c2d16c2f778aa7887659741a7
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
d6e5029b2df45210834334f7c2e99dfc85e962f0 |
|
28-Oct-2011 |
Chih-yu Huang <akahuang@google.com> |
Show video snapshot toast in first use. bug:5494290 Change-Id: I7cb498ef50610d300a64d9d053b0a411d86da730
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
cfcb0b746106900c9233f9bf51843f82d50f9d20 |
|
26-Sep-2011 |
Angus Kong <shkong@google.com> |
Fix the bug that local preference is not reset. bug:5366049 Change-Id: Ifee52c43c7c2ec8ff674fca8ce7762cc489c1b6a
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
926405a84a882ab78f2f5aa1e88c4961640724f7 |
|
20-Sep-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Restrict effects to 480p. - Preview stretching still occurs after some transitions. - Correct quality used in recording, shown in UI at all times. Bug: 5320425 Change-Id: I63612c55d2e6e0e979208c59f2caf9a61ac1d3f8
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
05999715cc38365aa4751a2a355eb1af284573ab |
|
23-Sep-2011 |
Angus Kong <shkong@google.com> |
Show the real resolution for quality settings. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
9efb0b19fa929c528253f0a9b6f5b27791e1ee52 |
|
20-Aug-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add video recording with effects into Camera. Initial support for video recording in the Camera app, with the goofyface and background replacement effects. Bug: 5212166 Change-Id: I30995e305c202ba57bf76ff18c885bf16c5ea14f
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
71e76dcebdbb3e5768fc948bed9c529a5787294e |
|
28-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add goofy face effect setting UI. The functionality is not working yet. bug:5226051 Change-Id: Icb684d9320688f90ea0856b97424f9bfb6c47f39
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b0c6bcf47a8ca1c096d98ebebd33a821dd483585 |
|
18-Aug-2011 |
Chih-yu Huang <akahuang@google.com> |
Add exposure indicator on screen. bug:5141528 Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
98d615769af2b08bcddf02ee1b11f5288ec5cf92 |
|
15-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add tap to focus toast. bug:5039278 Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22 |
|
14-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Remove focus mode setting if tap-to-focus is possible. bug:5141526 Change-Id: I947721209ffbcb3eb6f443cb503f80871031a0bf
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
d159d11f5a47928a59c9bf27fbae1a95dd6cbb02 |
|
10-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Remove color effects to simplify UI. bug:5141303 Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
9fff0f154b8531094aa1349e0241a998c14da810 |
|
05-May-2011 |
Wu-cheng Li <wuchengli@google.com> |
Pass camera id while getting camcorder profile. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
4a70e66b58207703f8a705548efcd5353106e452 |
|
28-Feb-2011 |
Wu-cheng Li <wuchengli@google.com> |
Fix settings are not retained when we toggle from still & video mode. "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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b3681fed693233f202e250ff22fed70d1bbb1932 |
|
18-Jan-2011 |
Wu-cheng Li <wuchengli@google.com> |
Remove 0.25s and 0.5s from time lapse recording. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
e64363e447ce719601f8e5b5de7ff0497a607a09 |
|
18-Jan-2011 |
Wu-cheng Li <wuchengli@google.com> |
Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference. Change-Id: Ib00968c41b89733594725d2e921da2b8e4158a97
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
75da345f6899b6e10274b9a443b32848aa34f39c |
|
23-Dec-2010 |
Chung-yih Wang <cywang@google.com> |
Increase the resolution of video quality low. bug:3287017 Change-Id: I7b3d814eecad5555690e1afca6e038ca43e44aeb
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
286727c4681ccdc0b9832ff006accf569ddab172 |
|
17-Dec-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove the 30-minute limitation of video length. New devices do not have this limitation anymore. Change-Id: I48e30c55a5375b6926c861c5d2f2466f54e87ea9
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
2a58972491262e81f941293653dba81c9446fb46 |
|
15-Dec-2010 |
Wu-cheng Li <wuchengli@google.com> |
Change youtube video limit from 10min to 15min. bug:3287031 Change-Id: I92ea46c9e3940d2537fcc89b02395928671c89f5
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
10208b3b4e2e9ca5af27be49356288531e3cd45b |
|
10-Dec-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove mms quality if the device does not support voice. bug:3272846 Change-Id: Ic573e790d323e93c9976e9985308890031d26a0b
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
003dd5a52457c024a0f99a2bb222bfc6ad70bbe5 |
|
06-Dec-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add restore default in other settings. Also change the theme to Holo. bug:3156672 Change-Id: Ied6f2d3543c3a3282c62b2cc31e5cf4cc30c3172
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
68c7128fb60ed5b83f7af13c02111b079218879a |
|
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of 79769585 to master Change-Id: I8e78a4e4bd1dbd8f7f48196107ab78c915244e6e
|
f68b4b26dfa43b99aa20e20f534330105edc30ec |
|
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of cdd3e6fe to stage-korg-master Change-Id: I7f5844e0bb9a46cd8948b830712efdbc596a49f7
|
59ddc8c1add2fcffe523e3877baad1b6cc5ba2fb |
|
22-Nov-2010 |
Chung-yih Wang <cywang@google.com> |
Add front/back camera switch bug:3156676 Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
f59f7fb9870c1f285f9bdb5e3ca47a1548527837 |
|
08-Nov-2010 |
Wu-cheng Li <wuchengli@google.com> |
am c309fcde: am 35c8657f: Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread * commit 'c309fcde67648ae483cab117a956ce11cf065ffd': Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
|
2b4b2a4b2ec489f93b2a98d5c90d972c50a38c7d |
|
07-Nov-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove android.hardware.Camera.CAMERA_ID_DEFAULT. bug:3173302 Change-Id: I2141456f3577e504e173a46efdbb343e03aaa5f5
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
a5ed74a5ad06f43b1129a9c698d7416ec3da4609 |
|
06-Nov-2010 |
Mohammad Shamsi <m.h.shams@gmail.com> |
code cleanup: unused import statements, local varaiables and ... removed from Camera app Change-Id: I6480b49bffa898400b2f2f3eeea85ce3bceed457
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
987e9b4e1849f2a3eab840de472e15ccde21d262 |
|
14-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
am bfc24ed9: am cec28d72: Merge "Do not show the setting if there is only one supported option." into gingerbread Merge commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1' * commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1': Do not show the setting if there is only one supported option.
|
22216b6cc942fc3a97b99d6bce4b1a86f19c08d4 |
|
12-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Do not show the setting if there is only one supported option. bug:3064986 Change-Id: I1d3a8cff955d203c2a055ee596f30035001a5c63
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
c300a0266d634bb7a1e2df816e97bad2836991ac |
|
03-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Pass camera id to CamcorderProfile.hasProfile. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
2b2cbfb78e3e184b55041926c7bc7bdc18cb5934 |
|
16-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am c97d2382: Update the code due to API change. Merge commit 'c97d23826a28dd725951eccb62651244f9fb8228' * commit 'c97d23826a28dd725951eccb62651244f9fb8228': Update the code due to API change.
|
f6a9ed7f6b08d0694795adc6ea6fce999e8cab87 |
|
15-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding ui for setting frame capture interval. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
c97d23826a28dd725951eccb62651244f9fb8228 |
|
15-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Update the code due to API change. bug:3001395 bug:3001399 Change-Id: Ie1347ed28aa72a3ec637867dc2226c60ef2dbd6c
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
035376721081f70aaf41d3da31aa50b479624ef0 |
|
12-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Filter out unsupported time lapse resolutions. - 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
8eaa6919f0d5c10c95c99f2f937d57ea5c4a5bba |
|
26-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add switch camera on-screen button. DO NOT MERGE Change-Id: I00895a9df69d2b29656075da1e03b1a1f684b107
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
7add00693c1ec910bc8700fe046ee18cbe4e1148 |
|
09-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add switch camera on-screen button. Change-Id: I1564fdf0f7f70f15278bdbdee6d9b5c8a6e683e0
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
77b6c6a8ef32eeca4c527ca52b04451e7458599e |
|
08-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 4714a1cf: Use SharedPreferences.apply to reduce latency. Merge commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0' * commit '4714a1cf1d211aad2d8cf1802f85f649e744beb0': Use SharedPreferences$Editor.apply to reduce latency.
|
4714a1cf1d211aad2d8cf1802f85f649e744beb0 |
|
08-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Use SharedPreferences$Editor.apply to reduce latency. Replace all commit with apply. bug:2978683 Change-Id: I6c057fab588aada7c35d03f6237fb850d2a2e856
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
65c5919bc9d1aa584717cbd9a2641151a4e41426 |
|
02-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbread Merge commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58' * commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58': Remove quick capture UI. It is not used.
|
ed8d17a1716b0c8d7d4f4451ad15de66355e9dc0 |
|
01-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove quick capture UI. It is not used. Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
7a03ab3258d2c6baa397da09c8a98b0a23426d8c |
|
30-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 454c6838: Remove metering mode support. Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda' * commit '454c6838bb220142d05fbd6f1858ba31cc034eda': Remove metering mode support.
|
454c6838bb220142d05fbd6f1858ba31cc034eda |
|
30-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove metering mode support. Change-Id: I624f611e19c438630bc84778332d13f0357da23f
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
6227fa641518492a6b660c78463da18d9ec8fcd8 |
|
06-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Added support for time lapse video capture. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
1ef634d277d550ed55b5b7089dfd56ed71815bd6 |
|
17-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Support multiple camera preferences. Change-Id: I7c8440424c472c9ff61ac22692ce60234d359efe
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 |
|
15-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Support switching between multiple cameras. Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
186ff08e71d106e329171055accd4395760495ea |
|
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add metering mode support. Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
1e7d70c59c3547db7589c1cae977e98d9b4e95b9 |
|
26-Apr-2010 |
Owen Lin <owenlin@google.com> |
Avoid loading drawables in CameraSettings. Bug: 2430326 Change-Id: Ia5e6f4320fac3a89ede5054e9ac7b6f31c973273
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
3a4ef93f95bed9f812fe75ef94296450833b3997 |
|
31-Mar-2010 |
James Dong <jdong@google.com> |
Camera app update due to CameraProfile and CamcorderProfile API changes 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
f5876dbd29607a0e9762f88e9db6fa35ffb20067 |
|
18-Mar-2010 |
Owen Lin <owenlin@google.com> |
More improvement on UI. 1. Disable on-screen settings while video/camera is acting. 2. Reset exposure in onResume() Change-Id: I4a58ae9c1a2ecff6d3f504de48e2504c8d86c1f3
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec |
|
15-Mar-2010 |
Owen Lin <owenlin@google.com> |
Fix several UI issues. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
469a9ef839e38630e1e652d182f7e0ee5882e277 |
|
10-Mar-2010 |
Owen Lin <owenlin@google.com> |
New UI for camcorder. Change-Id: Id35564836da7b4051662cccfd0920480421499b0
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
e480f77352d670b2892a9b7b7cd503838b71ca9f |
|
10-Mar-2010 |
Romain Guy <romainguy@android.com> |
Camera should have the com.android.camera package name. Related to bug #2464545 Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
33be45a1abaf6a8d611fb87b18945c84ab76c229 |
|
06-Mar-2010 |
Owen Lin <owenlin@google.com> |
Add the new ZoomController UI and also the exposure compensation settings. 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
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
3889cf31101cfd4d336f1ce5ae5122c2cb3c0fdc |
|
06-Mar-2010 |
Chih-Chung Chang <chihchung@google.com> |
Unbundle: change camera package name. Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
9a4c2cac83f50e29063d27605c9f8d9e676a6f22 |
|
06-Mar-2010 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
e8697d7437c343e31e815fd4714238afafc7b1ac |
|
05-Mar-2010 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code. This is for unbundling, will clean more later.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
02627adfa3d240d817e34af69be8d07e9c66c136 |
|
24-Feb-2010 |
James Dong <jdong@google.com> |
Set duration and still image encoding quality using Java API - rebased bug - 2375978
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
8791695ba110ad0b088d2e8b3b0127c0042e1865 |
|
23-Jan-2010 |
Owen Lin <owenlin@google.com> |
Add quick capture settings for Camera application. Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b Bug: 2259528
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
73e782de608cbe2ddffd75c055009ff2e208f78b |
|
19-Jan-2010 |
Owen Lin <owenlin@google.com> |
Unbundle with the PreferenceManager. Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
da3e9964a4a82a942d7f450e7c89904f5c5aa03f |
|
07-Dec-2009 |
Wu-cheng Li <wuchengli@google.com> |
Add flash light setting in video camera. http://b/2118298
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
4ddee78a1507b3c067745023bd2330b866b8aaf9 |
|
24-Nov-2009 |
Owen Lin <owenlin@google.com> |
Add one more picture size settings. We need small size for the fake camera in emulator. Change-Id: I5543936338813d575efc158c78e219da7feb9415
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
e1706c13d469a163d811e29d33b86cc5d4bf67e9 |
|
19-Nov-2009 |
Owen Lin <owenlin@google.com> |
am 3e44f807: Use "Use My Location" settings to decide wheather we store the 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.
|
3e44f8076a16792bb295589ca4b467ba27ea2a6f |
|
17-Nov-2009 |
Owen Lin <owenlin@google.com> |
Use "Use My Location" settings to decide wheather we store the picture's location. However, if user has specifically assign the "Record Location" we will follow the settings. Bug: http://b/2265010 Change-Id: I4863d299b8f461ee73c8aeb4651740855efe3dbd
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
ca99fb07777edcde4c9159c1567b95a227e916fa |
|
10-Nov-2009 |
Chih-Chung Chang <chihchung@google.com> |
am 01ed85fb: Merge change Ic823abd0 into eclair Merge commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0' into eclair-mr2 * commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0': Fix 2241232: Read system properties for quality setting.
|
faf398ff0fa2b51348b4545505112d70ba7b47a1 |
|
09-Nov-2009 |
Chih-Chung Chang <chihchung@google.com> |
Fix 2241232: Read system properties for quality setting. Change-Id: Ic823abd0c352b3eca0b8ef504307bd1de7d1700f
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
271b3095b9f763421c0547109da9de774795072d |
|
02-Nov-2009 |
Chih-Chung Chang <chihchung@google.com> |
Clean up and add comments for classes.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
77c1cdc8f2cda250b1db842204efb49f87e094ae |
|
02-Nov-2009 |
Chih-Chung Chang <chihchung@google.com> |
Clean up and add comments for classes.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
22a695f8ca31dc2899e7206d68316c7e6d960657 |
|
19-Oct-2009 |
Owen Lin <owenlin@google.com> |
Fix the bug that one-item only settings still shown on menu. Change-Id: I6c57ed929f74d9f170b3e07c4db54134b2869e78 http://b/issue?id=2196476
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
5a0f8a8db0a20ac8fec5e33d88e43d6c6259edae |
|
06-Oct-2009 |
Chih-Chung Chang <chihchung@google.com> |
Fix 2166632: Change of wording in Camera ->Video ->Settings
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
df3731bacfe26910a5dd0813c6aa80a6e55b85ad |
|
02-Oct-2009 |
Cheng-Ru Lin <owenlin@google.com> |
Fix the issue that focus options shown on those device without focus support. This is for bug http://b/2161159 Change-Id: I8f184b8aa5040c19b4f82775b30a99fed4ca035c
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
2f3774c974a5a044a3b32ca68182a3f2180d0124 |
|
30-Sep-2009 |
Cheng-Ru Lin <owenlin@google.com> |
Revert "Revert "Add icon support for options in preference setting screen."" This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef. Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
7af25641ec401d9f669497bd401020f2cb5933ef |
|
29-Sep-2009 |
Cheng-Ru Lin <owenlin@google.com> |
Revert "Add icon support for options in preference setting screen." This reverts commit 723f84eadb3c1a79337ef20e4d0a014341537adb. Conflicts: res/values/arrays.xml res/xml/camera_preferences.xml src/com/android/camera/IconListPreference.java Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
7e4655b1b3fcbc543430bea680872f564af098f5 |
|
26-Sep-2009 |
Wei-Ta Chen <weita@google.com> |
Fix http://b/2144590 by honoring Intent's content when provisioning options in on-screen settings.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
a8bbcd7ce25aada705561852ea9f356dc38c0f43 |
|
25-Sep-2009 |
Cheng-Ru Lin <owenlin@google.com> |
Change the checkbox style to list style for record location preference. Change-Id: Ie209887169623f090df0ee7a85f2709b4a54e202
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
32bfffa5822490ea0e105e9fe00b9df8db1b7b02 |
|
19-Sep-2009 |
Owen Lin <owenlin@google.com> |
Change the default settings of picture size to the largest one. This fix issue: http://b/2140738. Change-Id: I9d92370897df7fe392801baa068913728c7d2ffc
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
723f84eadb3c1a79337ef20e4d0a014341537adb |
|
19-Sep-2009 |
Owen Lin <owenlin@google.com> |
Add icon support for options in preference setting screen. Change-Id: I4029ef11d49922139b8aab423e9871c803ab4a82
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
71d56e21859a797ec4633f209b3605276345d44e |
|
23-Sep-2009 |
Owen Lin <owenlin@google.com> |
Fix some warnnings reported by eclipse. Change-Id: I40037e0735ddbca750cbe5f8364af5247992c51c
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
ed6661e212048dc3e143c48402b3935911c3741c |
|
21-Sep-2009 |
Wu-cheng Li <wuchengli@google.com> |
Use new focus mode API.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b6ad206f53981faee04800b787569dbb60492844 |
|
21-Sep-2009 |
Owen Lin <owenlin@google.com> |
Fix a bug that we didn't check if flash modes is supported by current device. Change-Id: Iea47f6cba6f99975e0c463b9a52e69a8b6247eff
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
cc529326d9369290abd6933f1d070859b3cadf75 |
|
18-Sep-2009 |
Wu-cheng Li <wuchengli@google.com> |
Set focus mode to camera driver and add macro focus.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
6d12b828743cbd81767227229d6351ce412d5698 |
|
17-Sep-2009 |
Owen Lin <owenlin@google.com> |
Simplify the code. Change references of "@strings" to literals for those non-translatable values. Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
78f160ee416ba27ba55954950473e17ba9d20052 |
|
10-Sep-2009 |
Owen Lin <owenlin@google.com> |
Remove CameraSettings. And then renmae CameraSettingsHelper to CameraSettings Change-Id: I515c90bb5c4d49a2c4a761a933c0db6fbec0637b
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
8d0ba007ec6ef9bb34dc0c9f40c4c29dad2691e0 |
|
08-Sep-2009 |
Owen Lin <owenlin@google.com> |
Add scene mode preference in camera. Change-Id: I56fe3a1fc942f18faefbbc06d0fdac013c791ed6
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
5f6484a74fe019337e436e6e0dcb07375a74af25 |
|
02-Apr-2009 |
President Li <wuchengli@google.com> |
Cherry pick two commits that implements color effect and white-balance settings and then make it workable. Change-Id: I519bff761db4b2b0acc1a61a8f901fafcd4b2586
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f |
|
07-Sep-2009 |
Chih-Chung Chang <chihchung@google.com> |
Fix 1977974: For photos without location data, don't offer to "Show on Maps" Change-Id: I7445e365ad9158312149dc80cf73361655171ba2
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
9b93bcbe3ccc49db5ce42de19fda1d3a9ef0011b |
|
04-Sep-2009 |
Chih-Chung Chang <chihchung@google.com> |
Code clean up. Change-Id: I8814d8482df5709b03ef105f547f4981db34919a
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
4305c70dc849156be5d79d52772ea71cd890ca40 |
|
02-Sep-2009 |
Wu-cheng Li <wuchengli@google.com> |
Use new parameters API.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
6f2c530d91749ff2b235125c3d134c981970f13d |
|
31-Aug-2009 |
Chih-Chung Chang <chihchung@google.com> |
Make the video duration preference text depend on the system property. Also upgrade old "1 minutes" duration to new "MMS video length" duration. Change-Id: I21a975f2a3f1cde1c35a336e5552a2ae350bb6f6
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
3f3c857e3f34650c15d764810335024654b0fcc3 |
|
18-Aug-2009 |
Owen Lin <owenlin@google.com> |
Show error dialog when the camera hardware is busy (Eg: hijack by other activity). We also change the behavior of the "Camera button", if the camera is being used by others. We just ignore the request and won't start the camera. Change-Id: Icf3b00113aba61c9aa3f43ba07cf6944085d5d52
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
522e836abc90bcb2d4e7a4ac37e269154d06c715 |
|
26-Aug-2009 |
Chih-Chung Chang <chihchung@google.com> |
Style fix. Change-Id: I09ba86ee314e643415e41879c1d20ab1ede65a91
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
8df283a6685ee0dd18cd3276b6bb716b21f269c6 |
|
21-Aug-2009 |
Chih-Chung Chang <chihchung@google.com> |
Add on-screen flash button.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
5945773c664ada754ce5eb9239bd4c8bd95ee4b4 |
|
03-Aug-2009 |
Wu-cheng Li <wuchengli@google.com> |
Add flash mode setting.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b5e5722981c02926fdbeae7880e662cbbacfe173 |
|
18-Jun-2009 |
Wu-cheng Li <wuchengli@google.com> |
Remove white balance, effects, ISO, and brightness from setting.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
cd65be31531717fb032b7423f8d5a77df465cfca |
|
09-Jun-2009 |
Chih-Chung Chang <chihchung@google.com> |
Share Camera between Camera and VideoCamera.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
82ded2070a47fff16e1de1c78b516eb25888b91e |
|
20-May-2009 |
Chih-Chung Chang <chihchung@google.com> |
Implement 1746508: add duration limit settings to camcorder.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
48b71ca522b5915b1163d91cd41875878692ab18 |
|
26-Apr-2009 |
Wu-cheng Li <wuchengli@google.com> |
Add ISO setting. modified: res/values/arrays.xml modified: res/values/strings.xml modified: res/xml/camera_preferences.xml modified: src/com/android/camera/Camera.java modified: src/com/android/camera/CameraSettings.java
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
c8cd9098d9ca174f5a0374789145faf1f15d503d |
|
17-Apr-2009 |
Ray Chen <raychen@google.com> |
Two remaining files for brightness control.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
c396ca0bd5129bc6ae754ea7366e410c5bac41b0 |
|
15-Apr-2009 |
Ray Chen <raychen@google.com> |
Add brightness control to Camera application.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
0a475e11e2ceadbaa70308b52e06f4e6d9e56f12 |
|
16-Apr-2009 |
Chih-Chung Chang <chihchung@google.com> |
Code clean up.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
0f56ef5704b7f1a0874528367147487c051876d9 |
|
15-Apr-2009 |
Wu-cheng Li <wuchengli@google.com> |
Add infinity focus mode.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
c6b84a41226d54988f2def467e2986fc2d94dbfa |
|
13-Apr-2009 |
Wu-cheng Li <> |
Merge branch 'readonly-p4-donut' into donut
|
e0770004600f76cc4b440104e98e14712b4fd1c6 |
|
13-Apr-2009 |
Wu-cheng Li <> |
AI 145839: Add UI for JPEG quality setting. BUG=1761244 Automated import of CL 145839
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
4ea566fe55564c72ddfe148cf611966b053e0fd8 |
|
10-Apr-2009 |
Wu-cheng Li <> |
Merge branch 'readonly-p4-donut' into donut
|
9dacf7b214339440c16f3d66e12d6afef1248f68 |
|
10-Apr-2009 |
Wu-cheng Li <> |
AI 145679: Add picture size settings. BUG=1761248 Automated import of CL 145679
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
4b85a0e01a0440a209d4df8fbf48fbcf8ac33e65 |
|
08-Apr-2009 |
Chih-Chung Chang <> |
Merge branch 'readonly-p4-donut' into donut
|
272c3fdc60d4b4f773dfdff46ad3dd643ce22d5c |
|
08-Apr-2009 |
Chih-Chung Chang <> |
AI 145048: Code clean up. Automated import of CL 145048
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
d4247bc43702d5ccda5dde40e948fffd6c4445ee |
|
07-Apr-2009 |
Ray Chen <raychen@google.com> |
Simple style fix to practice "Super-simple" work flow introduced by jbq.
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
2ac0387bbd6792187aeaacf10e40688f4260e316 |
|
02-Apr-2009 |
Wu-cheng Li <> |
AI 144213: Initial implementation of effect settings. BUG=1753515 Automated import of CL 144213
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
87341536812081826656040ac81f8f386c6c1407 |
|
02-Apr-2009 |
Wu-cheng Li <> |
AI 144187: Initial implementation of manual white-balance setting. BUG=1742461 Automated import of CL 144187
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b64d345c9d51cabce43b5191532a0c185d2a70a5 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
becfb351a5bc43050128f44eb1bcfbcc0c6dcb7a |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
b97ccf3f20bee44daf70f10966809e39e30ab4f7 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
0eaec58e292ce4eaa6baadecf643f0f65e48d278 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|
1d4c75065966c4f6f56900e31f655bfd1b334435 |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/packages/apps/Camera/src/com/android/camera/CameraSettings.java
|