summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Cancel focus after touch focus is triggered for 3 seconds."Wu-cheng Li2011-05-051-2/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Cancel focus after touch focus is triggered for 3 seconds.Wu-cheng Li2011-05-041-2/+17
| | | | | | | | | | | | | | | | | | | | bug:4349618 Change-Id: Ia7130300fe7358b0bd937ac7ca23b73a63860466
* | | | Trigger touch focus only when the event is ACTION_DOWN.Wu-cheng Li2011-05-041-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | So touch focus will not be triggered again when the preview area is still being pressed and autofocus completes. bug:3475893 Change-Id: Id84c0c6328778150c66d4e766ddf11cd18be1d36
* | | Refactor camera status and focus states.Wu-cheng Li2011-05-041-104/+86
| | | | | | | | | | | | Change-Id: I74fe291835e8f0cd9d852359463042969a801854
* | | Tap will invoke autofocus & metering, but not snap a photo.Wu-cheng Li2011-05-031-16/+21
| | | | | | | | | | | | | | | bug:4349618 Change-Id: I6458e24c4d7e892d51de3ecaba128195b7248b58
* | | Use frameworks focus area and metering area API.Wu-cheng Li2011-05-031-42/+20
| | | | | | | | | | | | | | | | | | bug:3475893 Change-Id: I96b958e60b93f48fd1ec27eb5e59ec3f2f11f5f7
* | | Do not trigger touch focus when popup window is dismissed.Wu-cheng Li2011-04-283-36/+33
| | | | | | | | | | | | | | | | | | | | | Also use getLocationInWindow instead of getLocationOnScreen. bug:3475893 Change-Id: I6e5917cf7340a7968fd07c13bf91e3c555d0cf87
* | | Reduce the size of focus rectangle.Wu-cheng Li2011-04-283-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Now the length of focus rectangle is 1/4 of the height of preview frame. bug:3475893 Change-Id: Ib1f09d5dbb25bb20343b39116c12febe08d83051
* | | Fix the incorrect position of focus rectangle.Wu-cheng Li2011-04-271-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The position of touch point should be based on the surface view, not the parent of the surface view. 2. The original images of focus rectangle had too much blank around the edges. bug:3475893 Change-Id: I59cdee2b0d1efff7ede91e6482fe270e914cf77f
* | | Set metering area when users touch on the preview frame.Wu-cheng Li2011-04-271-14/+34
| | | | | | | | | | | | | | | bug:3475893 Change-Id: Ie399f938a2a457effed705e9996d665268458f22
* | | Add touch to focus.Wu-cheng Li2011-04-191-7/+102
| | | | | | | | | | | | | | | | | | bug:3475893 Change-Id: I4b23052a6e548adf5b209d46661590b79b8cb557
* | | Add video capture intent tests.Wu-cheng Li2011-03-261-0/+5
| | | | | | | | | | | | Change-Id: Ic47007dae62e228267a9f4b3a037110cdf8cc52c
* | | Add image capture intent test.Wu-cheng Li2011-03-153-7/+30
| | | | | | | | | | | | Change-Id: Iba7ecf9054b630a14f1bf24ba223e0eecb1c3fd4
* | | am bcf62003: Fix image/video capture intents are broken after switching cameras.Wu-cheng Li2011-03-143-12/+31
|\ \ \ | |/ / | | | | | | | | | * commit 'bcf6200327be0b408426221767467ad2ce132a08': Fix image/video capture intents are broken after switching cameras.
| * | Fix image/video capture intents are broken after switching cameras.Wu-cheng Li2011-03-143-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intent action should be kept if it is IMAGE_CAPTURE or VIDEO_CAPTURE. This also fixes the bug that video capture will fail after retake. If the URI is passed in by the intent, it should not be removed from the content resolver. bug:4083519 Change-Id: Ia72e399ff8cd5c2a72cc6fe1500ee6922d9a4f5d
* | | am 26ebb8e9: Make still camera and camcorder switch easier to use.Wu-cheng Li2011-03-091-1/+4
|\ \ \ | |/ / | | | | | | | | | * commit '26ebb8e98e92599deec34b81623bbcb6213e5544': Make still camera and camcorder switch easier to use.
| * | Make still camera and camcorder switch easier to use.Wu-cheng Li2011-03-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Originally users have to touch on the horizontal bar between camera and camcorder icons to switch modes. This is a regression comparing to Gingerbread. Now users can touch on the icon and drag to the other end. 2. Increase the touchable area. 3. Fix the bug that x and y of the touch events are off. bug:4020145 Change-Id: I8ff241e1345e2c04d534ba421d977d33deb8b1cc
* | | Print log while getting error from MediaRecorder.OnErrorListener.Wu-cheng Li2011-03-091-0/+1
|/ / | | | | | | Change-Id: Iae82d210c5c28873e886d55ed52b826a4bb46167
* | Fix a NPE in error handling code.Owen Lin2011-03-021-4/+5
| | | | | | | | | | bug: 3499208 Change-Id: I45071a0d373cff2c58d9bbd89a46109750183020
* | Fix settings are not retained when we toggle from still & video mode.Wu-cheng Li2011-02-282-0/+6
| | | | | | | | | | | | | | | | | | | | "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
* | Fix the bug that exposure is not matching with settings.Wu-cheng Li2011-02-285-0/+35
| | | | | | | | | | | | | | UI should be updated when exposure is reset in onResume. bug:3398281 Change-Id: I535bac04643a684262ff756d079efc220e4bfa3d
* | Restart the activity while switching front and back cameras.Wu-cheng Li2011-02-252-51/+10
| | | | | | | | | | | | | | | | | | This adds 300ms latency but the switching looks better with the crossfade animation. We should use SurfaceTexture to do a better and faster animation in the future. bug:3446535 Change-Id: Ib5a5b2c049fb7c4d93769af530dd07a333ff4cb8
* | Merge "Make arc-shaped animation in time-lapse recording look better."Wu-cheng Li2011-02-241-22/+8
|\ \
| * | Make arc-shaped animation in time-lapse recording look better.Wu-cheng Li2011-02-251-22/+8
| | | | | | | | | | | | Change-Id: I2bd2fca6948ae9edd6b26bee23000a41a239cbb3
* | | Merge "Ignore search and menu long press key event."Wu-cheng Li2011-02-243-11/+17
|\ \ \
| * | | Ignore search and menu long press key event.Wu-cheng Li2011-02-253-11/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ignore menu key during recording. In phone UI, long-pressing search key will launch voice search. Long-pressing menu key will launch software keyboard. It is annoying to accidently launch them while taking a picture. bug:3108635 bug:3278557 Change-Id: I87a5411d08c4bb292b5a0f78a4a0992a59e8816c
* | | Close video fd after recording is done.Wu-cheng Li2011-02-241-7/+9
|/ / | | | | | | | | | | | | | | | | MediaRecorder sets the fd in prepare(). If camcorder closes fd before that, fd will be -1 and prepare will fail. bug:3471488 Change-Id: I72840ae8eb06a475a2d13745a15c57911558c97c
* | Add animation for popup windows and enable hardwareAccelerated.Wu-cheng Li2011-02-221-4/+23
| | | | | | | | | | | | | | | | | | Enabling hardwareAccelerated greatly improves the performance of popup windows. bug:3446447 bug:3307722 Change-Id: I87bbabdeba63781fa8bee9aab6ca1b5cd3c0a381
* | Merge "Use crossfade transition when switching between still and video camera."Wu-cheng Li2011-02-201-1/+1
|\ \
| * | Use crossfade transition when switching between still and video camera.Wu-cheng Li2011-02-211-1/+1
| | | | | | | | | | | | | | | bug:3446485 Change-Id: I39856a7254e3e8b3ffbea677412edbeb145e7158
* | | Fix wrong preview orientation when device is held upside down.Wu-cheng Li2011-02-182-0/+50
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Suppose a user opens camera app and press home to exit. The user holds the device upside down and opens camera again. The animation takes some time so camera app will get the old rotation value in onResume and surfaceChanged. Besides, framework does not have a callback for it. The solution is to poll the rotation value for 5 seconds. If it changes, restart the preview. bug:3362860 Change-Id: I065e8601e321361d8db405f9c587ec2a5bce050c
* | Make zoom more smooth.Wu-cheng Li2011-02-112-13/+65
| | | | | | | | | | | | | | | | | | | | Originally startSmoothZoom and stopSmoothZoom were called many times even while the zoom button is being pressed. Now startSmoothZoom is only called once when the button is pressed and stopSmoothZoom is called once when the button is unpressed. Change-Id: I88a7c5027e54a3b36759ded448530cfd310aa0aa
* | Fix shifted UI during HDMI output.Wu-cheng Li2011-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | The background image has two problems. The ring in the image was not aligned in the middle. The sizes of top and bottom stretchable areas were different. bug:3416589 Change-Id: Ibcc2c556af147267078f495f6fdc08b68f30e441
* | Fix camera preview orientation when device is held in portrait.Wu-cheng Li2011-01-263-7/+26
| | | | | | | | | | | | | | | | | | | | | | The problem is the rotation animation may still in progress during onCreate. When we start the preview in onCreate, the display rotation is still the value in portrait. So we check the display rotation again in surfaceChanged. If it is different, restart the preview. bug:3362860 Change-Id: Ib930c18d089114a3b5b9ca0f599e1ebdace73eb7
* | Merge "Fix NPE in BasicSettingPopup." into honeycombWu-cheng Li2011-01-252-10/+7
|\ \
| * | Fix NPE in BasicSettingPopup.Wu-cheng Li2011-01-252-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The monkey test sends DPAD_CENTER event and brings up the soft keyboard. The layout will change and the basic setting popup may have fewer children than items. In fact, setActiviated is called by ListView and we do not need to call it. Also add stateAlwaysHidden to make sure soft keyboard is always hidden. bug:3383128 Change-Id: I8032ff4680af7617c1568632af1c1678a04a04f8
* | | Fix focus mode is not updated when scene mode changes.Wu-cheng Li2011-01-251-1/+2
|/ / | | | | | | | | bug:3382475 Change-Id: Iff8649b76443a882d9a62437e9843a71c57dcbc3
* | Merge "Remove ImageCapture class to fix NPE." into honeycombWu-cheng Li2011-01-241-113/+81
|\ \
| * | Remove ImageCapture class to fix NPE.Wu-cheng Li2011-01-211-113/+81
| | | | | | | | | | | | | | | bug:3375346 Change-Id: I6b3b889dcd40e98321c5ca9987ceab424f966ff9
* | | Update video quality icons.Wu-cheng Li2011-01-211-1/+1
|/ / | | | | | | | | | | | | Also move the positions of icons by 2 pixels. bug:3321003 Change-Id: Iab86457d4d701ef19bdd02882a1457d6c2a6b442
* | Merge "Use arc shaped indicator to show the next frame in time lapse." into ↵Wu-cheng Li2011-01-192-0/+74
|\ \ | | | | | | | | | honeycomb
| * | Use arc shaped indicator to show the next frame in time lapse.Wu-cheng Li2011-01-192-0/+74
| | | | | | | | | | | | | | | bug:3278557 Change-Id: Icee0bbe93cd5558aabc474bfba74a217fd5d4501
* | | Update the recording time by time lapse frame interval.Wu-cheng Li2011-01-191-2/+5
|/ / | | | | | | Change-Id: I518c4e803dbe12b6dc3c8571233a2021c83de64f
* | 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
* | Merge "Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference." into honeycombWu-cheng Li2011-01-182-8/+0
|\ \
| * | Remove unused KEY_VIDEO_TIME_LAPSE_QUALITY preference.Wu-cheng Li2011-01-182-8/+0
| | | | | | | | | | | | Change-Id: Ib00968c41b89733594725d2e921da2b8e4158a97
* | | Change AlertDialog.setIcon to setIconAttribute.Wu-cheng Li2011-01-182-2/+2
|/ / | | | | | | | | | | | | Use setIconAttribute to tell the framework you want the icon that works with the theme you have set on your alert dialog. Change-Id: Ie6e39f5c311f419c18d833323696363fa494aae9
* | Correct the path of 100ANDRO.Wu-cheng Li2011-01-171-1/+1
| | | | | | | | | | bug:3361763 Change-Id: Ieed266fb498d41ee8dc5933d2fe8947037e09852
* | Tapping a ring control with menu opened should close it.Wu-cheng Li2011-01-143-27/+74
| | | | | | | | | | bug:3324333 Change-Id: I6a82db8b36b293630e6a487c22d270e23651dfe4
* | Refactor. Move the logic from ControlPanel to IndicatorWheel.Wu-cheng Li2011-01-134-322/+229
| | | | | | | | | | | | | | The refactor is required to fix 3324333 properly. bug:3324333 Change-Id: I8e4c9519cafac11bceea8dcaf22a4a92b2dd6181