OSDN Git Service
Android (Google) Code Review [Fri, 25 Sep 2009 20:34:34 +0000 (16:34 -0400)]
Merge change 27000 into eclair
* changes:
Fix
2145360: NPE in ImageViewTouch.onKeyDown
Android (Google) Code Review [Fri, 25 Sep 2009 15:25:31 +0000 (11:25 -0400)]
Merge change 27013 into eclair
* changes:
Modified the test cases name to be more meaningful.
Yu Shan Emily Lau [Fri, 25 Sep 2009 07:20:23 +0000 (00:20 -0700)]
Modified the test cases name to be more meaningful.
Chih-Chung Chang [Fri, 25 Sep 2009 04:17:51 +0000 (21:17 -0700)]
Fix
2145360: NPE in ImageViewTouch.onKeyDown
Chih-Chung Chang [Fri, 25 Sep 2009 00:44:36 +0000 (17:44 -0700)]
Disable animation for Camera and VideoCamera activities so the switch does not cause animation.
Wei-Ta Chen [Thu, 24 Sep 2009 22:01:53 +0000 (15:01 -0700)]
Fix b/
2140611 by adjusting the width of the preview view when video quality is changed.
The preview view's aspect ratio should be the same to that of the preview frame.
Android (Google) Code Review [Thu, 24 Sep 2009 20:47:16 +0000 (16:47 -0400)]
Merge change 26879 into eclair
* changes:
Fixed the switching mode test case. Send out the intent instead of sending the raw menu key event.
Yu Shan Emily Lau [Thu, 24 Sep 2009 18:49:01 +0000 (11:49 -0700)]
Fixed the switching mode test case. Send out the intent instead of sending the raw menu key event.
Chih-Chung Chang [Wed, 23 Sep 2009 23:02:30 +0000 (16:02 -0700)]
Return full size image jpeg if the user provides an Uri.
Ray Chen [Fri, 28 Aug 2009 00:59:29 +0000 (17:59 -0700)]
Change Camera & Gallery code to use the new thumbnail APIs.
Owen Lin [Sat, 19 Sep 2009 11:50:42 +0000 (19:50 +0800)]
Add icon support for options in preference setting screen.
Change-Id: I4029ef11d49922139b8aab423e9871c803ab4a82
Android (Google) Code Review [Wed, 23 Sep 2009 18:08:31 +0000 (14:08 -0400)]
Merge change 26594 into eclair
* changes:
Fix some warnnings reported by eclipse.
Android (Google) Code Review [Wed, 23 Sep 2009 18:01:19 +0000 (14:01 -0400)]
Merge change 26492 into eclair
* changes:
Fix http://b/
2131805. Just let make those long string be in two lines.
Owen Lin [Wed, 23 Sep 2009 14:27:04 +0000 (22:27 +0800)]
Fix some warnnings reported by eclipse.
Change-Id: I40037e0735ddbca750cbe5f8364af5247992c51c
Wei Huang [Wed, 23 Sep 2009 07:45:03 +0000 (00:45 -0700)]
need READ_SMS permission to read the temp url for storing a captured photo.
Change-Id: I2eb42cf3107a389a5101a6f366368abf54cb991f
Android (Google) Code Review [Wed, 23 Sep 2009 03:29:17 +0000 (23:29 -0400)]
Merge change 26484 into eclair
* changes:
Fix
2129498: add a MaxNumOfPixels parameter for client to specify the captured picture size.
Chih-Chung Chang [Tue, 22 Sep 2009 23:47:43 +0000 (16:47 -0700)]
Fix
2129498: add a MaxNumOfPixels parameter for client to specify the captured picture size.
Owen Lin [Mon, 21 Sep 2009 19:35:52 +0000 (03:35 +0800)]
Fix the problem that for too long text the UI is bad.
Change-Id: I85534ead897d676facb3ec4fa791b5bfffee350b
Owen Lin [Wed, 23 Sep 2009 00:15:15 +0000 (08:15 +0800)]
Fix b/
2131805. Just let make those long string be in two lines.
Change-Id: I5a2fdc97716d51cce0a102b45f1f46e3d81332d8
Android (Google) Code Review [Tue, 22 Sep 2009 23:55:27 +0000 (19:55 -0400)]
Merge change 26388 into eclair
* changes:
Add the power measurment test case for image capture and video capture.
Yu Shan Emily Lau [Tue, 22 Sep 2009 18:19:52 +0000 (11:19 -0700)]
Add the power measurment test case for image capture and video capture.
Android (Google) Code Review [Tue, 22 Sep 2009 22:26:30 +0000 (18:26 -0400)]
Merge change 26400 into eclair
* changes:
Rotate the thumbnail bitmap according the jpeg header.
Android (Google) Code Review [Tue, 22 Sep 2009 22:01:28 +0000 (18:01 -0400)]
Merge change 26431 into eclair
* changes:
Add comments for some strings for translation purpose.
Wu-cheng Li [Tue, 22 Sep 2009 19:31:47 +0000 (03:31 +0800)]
Add comments for some strings for translation purpose.
Chih-Chung Chang [Tue, 22 Sep 2009 18:52:54 +0000 (11:52 -0700)]
Rotate the thumbnail bitmap according the jpeg header.
Android (Google) Code Review [Tue, 22 Sep 2009 18:15:16 +0000 (14:15 -0400)]
Merge change 26246 into eclair
* changes:
Update jpeg orientation tag for rotation.
Android (Google) Code Review [Tue, 22 Sep 2009 18:14:58 +0000 (14:14 -0400)]
Merge change 26245 into eclair
* changes:
Store orientation for pictures taken by Camera.
Owen Lin [Thu, 17 Sep 2009 09:55:37 +0000 (17:55 +0800)]
Add a icon bar to show the current state.
Change-Id: Ic0c32abffed267fa97b6b449c4dd432af3e0e591
Chih-Chung Chang [Mon, 21 Sep 2009 21:07:43 +0000 (05:07 +0800)]
Update jpeg orientation tag for rotation.
This (mostly) reverts commit
bacc4e595b85dc9fae34a47956a7ea8f6331b40a.
Chih-Chung Chang [Mon, 21 Sep 2009 21:04:34 +0000 (05:04 +0800)]
Store orientation for pictures taken by Camera.
Chih-Chung Chang [Mon, 21 Sep 2009 20:51:30 +0000 (04:51 +0800)]
Remove unused orientation parameter.
Wu-cheng Li [Mon, 21 Sep 2009 00:54:43 +0000 (08:54 +0800)]
Use new focus mode API.
Ray Chen [Mon, 21 Sep 2009 18:05:58 +0000 (11:05 -0700)]
Remove trailing spaces for easier code review.
Chih-Chung Chang [Sun, 20 Sep 2009 21:36:24 +0000 (05:36 +0800)]
Fix
2130355: Enter camera settings when recording a video will cause the phone to freeze and then reset
Owen Lin [Mon, 21 Sep 2009 01:58:09 +0000 (09:58 +0800)]
Fix a bug that we didn't check if flash modes is supported by current device.
Change-Id: Iea47f6cba6f99975e0c463b9a52e69a8b6247eff
Android (Google) Code Review [Mon, 21 Sep 2009 00:55:00 +0000 (20:55 -0400)]
Merge change 26045 into eclair
* changes:
Add checking before setting parameters of Camera hardware.
Android (Google) Code Review [Sun, 20 Sep 2009 23:27:45 +0000 (19:27 -0400)]
Merge change 25726 into eclair
* changes:
Change how VideoCamera uses lock() due to API change.
Wu-cheng Li [Fri, 18 Sep 2009 06:10:47 +0000 (14:10 +0800)]
Change how VideoCamera uses lock() due to API change.
Android (Google) Code Review [Sun, 20 Sep 2009 22:53:54 +0000 (18:53 -0400)]
Merge change 26043 into eclair
* changes:
Fix bug
2121734 (better guess at size of photo widget)
Mike Cleron [Sun, 20 Sep 2009 22:25:11 +0000 (15:25 -0700)]
Fix bug
2121734 (better guess at size of photo widget)
Wei-Ta Chen [Thu, 17 Sep 2009 11:10:08 +0000 (19:10 +0800)]
Fix b/
2072260 by supporting navigation keys in both viewing and reviewing pictures.
Owen Lin [Sat, 19 Sep 2009 14:12:48 +0000 (22:12 +0800)]
Add checking before setting parameters of Camera hardware.
It is possible that some features are not availalbe with newer
Camera driver. We add check for those unsupported features.
Chih-Chung Chang [Thu, 17 Sep 2009 10:09:49 +0000 (18:09 +0800)]
Update Camera to use new ExifInterface API.
Change-Id: I3e0f5dd1a34ad2cde59ed55733b4349bd4121a6e
Yu Shan Emily Lau [Fri, 18 Sep 2009 16:07:46 +0000 (09:07 -0700)]
Start the intent in order to switch to video capture mode.
Wu-cheng Li [Fri, 18 Sep 2009 07:34:37 +0000 (15:34 +0800)]
Set focus mode to camera driver and add macro focus.
Android (Google) Code Review [Fri, 18 Sep 2009 07:32:41 +0000 (03:32 -0400)]
Merge change 25719 into eclair
* changes:
Fix
2128896: The thumbnail generated is overlapped with previous thumbnail.
Android (Google) Code Review [Fri, 18 Sep 2009 07:28:38 +0000 (03:28 -0400)]
Merge change 25724 into eclair
* changes:
Fix the bug that we show camea preference in camcorder.
Chih-Chung Chang [Fri, 18 Sep 2009 06:22:13 +0000 (14:22 +0800)]
Fix
2128896: The thumbnail generated is overlapped with previous thumbnail.
Change-Id: I57048527912887a6f9ff10dbd59233fc73c0cc7b
Wu-cheng Li [Fri, 18 Sep 2009 07:08:01 +0000 (15:08 +0800)]
Fix the bug that sometimes scene mode parameter is not set.
Owen Lin [Fri, 18 Sep 2009 06:50:58 +0000 (14:50 +0800)]
Fix the bug that we show camea preference in camcorder.
Owen Lin [Thu, 17 Sep 2009 16:20:12 +0000 (00:20 +0800)]
Simplify the code. Change references of "@strings" to literals for those
non-translatable values.
Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0
Eric Fischer [Thu, 17 Sep 2009 21:30:04 +0000 (14:30 -0700)]
Import revised translations. DO NOT MERGE
Wu-cheng Li [Thu, 17 Sep 2009 10:07:34 +0000 (18:07 +0800)]
Fix the bug that sometimes zoom is not working.
Android (Google) Code Review [Thu, 17 Sep 2009 12:11:34 +0000 (08:11 -0400)]
Merge change 25456 into eclair
* changes:
Move flash settings from on-scren control to preference settings.
Owen Lin [Thu, 17 Sep 2009 06:45:06 +0000 (14:45 +0800)]
Move flash settings from on-scren control to preference settings.
Change-Id: Id45c7321c1e60cc7e29a7e9c601082624d93c9e8
Android (Google) Code Review [Thu, 17 Sep 2009 11:05:42 +0000 (07:05 -0400)]
Merge change 25324 into eclair
* changes:
Don't change to orientation in the jpeg file. (It didn't work anyway).
Chih-Chung Chang [Thu, 17 Sep 2009 10:34:47 +0000 (18:34 +0800)]
Fix
2122382: We don't handle overlay destroy and re-create properly.
Because the overlay behavior changed, the overlay will be destroyed if we hide it.
So we need to stop preview at that time. To properly handle this situation we need
to add more code and it will be slower. For now we just don't hide the overlay
because the image on top of it will obscure it anyway.
Change-Id: I5c479381a578448a712dedc1bb97ba6f36db468f
Owen Lin [Wed, 16 Sep 2009 06:43:09 +0000 (14:43 +0800)]
Handle the keep-screen-on more properly.
Change-Id: Iec16b1975537f69230d1c8ac19a5b0ff5a75d861
Owen Lin [Mon, 14 Sep 2009 11:04:37 +0000 (19:04 +0800)]
Implement the drawer UI. When user click on the drawer button, the
on-screen settings will show up.
Change-Id: I86a587969a9a01d62560e21d457d3639841ba6da
Android (Google) Code Review [Thu, 17 Sep 2009 08:40:22 +0000 (04:40 -0400)]
Merge change 25454 into eclair
* changes:
Fix a bug that if user close the settings directly from sub menu. The summary in main menu will not be updated.
Android (Google) Code Review [Thu, 17 Sep 2009 08:39:36 +0000 (04:39 -0400)]
Merge change 24874 into eclair
* changes:
Fix NPE in resizeForPreviewAspectRadio().
Owen Lin [Mon, 14 Sep 2009 10:48:12 +0000 (18:48 +0800)]
Fix NPE in resizeForPreviewAspectRadio().
In user mode, if start preview fail, don't try to
set resizeForPreviewAspectRadio(). Also make changes in VideoCamera to prevent
similar problems.
In eng mode, reveal the exception so that test tools can detect and report the
error
Change-Id: Ice457d753dcf18e8e93cac90aa62ee1adcc332cd
Owen Lin [Thu, 17 Sep 2009 06:24:05 +0000 (14:24 +0800)]
Fix a bug that if user close the settings directly from sub menu.
The summary in main menu will not be updated.
Yu Shan Emily Lau [Thu, 17 Sep 2009 01:15:38 +0000 (18:15 -0700)]
modified: tests/src/com/android/camera/stress/ImageCapture.java
Modify the test for the new UI.
Chih-Chung Chang [Wed, 16 Sep 2009 19:14:59 +0000 (03:14 +0800)]
Don't change to orientation in the jpeg file. (It didn't work anyway).
Android (Google) Code Review [Wed, 16 Sep 2009 12:14:56 +0000 (08:14 -0400)]
Merge change 25257 into eclair
* changes:
Use the new exif interface API.
Chih-Chung Chang [Wed, 16 Sep 2009 10:42:46 +0000 (18:42 +0800)]
Use the new exif interface API.
Change-Id: I2aba6e09601facc1db633c57a015ea73c3eacb31
Wei-Ta Chen [Wed, 16 Sep 2009 09:37:42 +0000 (17:37 +0800)]
Fix http://b/
2115002.
generateShuffleOrder() must be called after mAllImages is populated by init().
Android (Google) Code Review [Tue, 15 Sep 2009 14:13:40 +0000 (10:13 -0400)]
Merge change 25034 into eclair
* changes:
Fix
2083478: Camera needs an auto-focus cancel API
Wu-cheng Li [Tue, 15 Sep 2009 10:52:25 +0000 (18:52 +0800)]
Restart preview if preview size is changed in camcorder.
Chih-Chung Chang [Tue, 15 Sep 2009 07:33:39 +0000 (15:33 +0800)]
Fix
2083478: Camera needs an auto-focus cancel API
Change-Id: I015c2ec5496dfd3921845f4974ba91a388675763
Chih-Chung Chang [Mon, 14 Sep 2009 05:12:46 +0000 (13:12 +0800)]
Better fix for
2117211: NPE in Camera.onFlashModeChanged
Change-Id: I03be03c5a648ced971a600c86948d827ce6360bd
Owen Lin [Fri, 11 Sep 2009 08:03:42 +0000 (16:03 +0800)]
Serveral improvement of OnScreenSettings.
1. Keep in submenu after changing option. Users will need to press the selected
option again or press on "back" to go back to main menu.
2. Fix a bug that when submenu show up. User cannot use traceball to select menu.
3. Simplify the code, there is no need to use "mRecorderInitialized", we can know
that by testing whether mMediaRecorder is null.
Change-Id: I2ab949e26aef7f1f9f874252295c2066688ed49d
Android (Google) Code Review [Mon, 14 Sep 2009 08:09:50 +0000 (04:09 -0400)]
Merge change 24871 into eclair
* changes:
Fix the bug that scene mode doesn't change immediately.
Android (Google) Code Review [Mon, 14 Sep 2009 08:09:29 +0000 (04:09 -0400)]
Merge change 24866 into eclair
* changes:
Fix
2113527: NPE in ViewImage.onActivityResult.
Owen Lin [Mon, 14 Sep 2009 08:03:59 +0000 (16:03 +0800)]
Fix the bug that scene mode doesn't change immediately.
Change-Id: I22679cb2e25a6751021a225001247fbf03a758bb
Owen Lin [Fri, 11 Sep 2009 03:31:59 +0000 (11:31 +0800)]
Add OnVisibilityChangedListener to OnScreenSettings. So that we can
release the media recorder at better timing.
Also reset the OnScreenSettings when hiding it.
Change-Id: Ica62b665d5cc087dc00ccdda71875c7aadc071f1
Chih-Chung Chang [Mon, 14 Sep 2009 04:46:16 +0000 (12:46 +0800)]
Fix
2113527: NPE in ViewImage.onActivityResult.
Change-Id: I87eca374895b1896a993ed80aa204193dce17123
Android (Google) Code Review [Mon, 14 Sep 2009 04:23:20 +0000 (00:23 -0400)]
Merge change 24864 into eclair
* changes:
Fix
2117211: NPE in Camera.onFlashModeChanged
Chih-Chung Chang [Mon, 14 Sep 2009 03:40:12 +0000 (11:40 +0800)]
Fix
2117211: NPE in Camera.onFlashModeChanged
Change-Id: I80326d1f4556416bfb9bb42d69626df652e6b427
Chih-Chung Chang [Fri, 11 Sep 2009 17:30:42 +0000 (01:30 +0800)]
Fix
2114487: NPE in ReviewImage.onPrepareOptionsMenu
Owen Lin [Thu, 10 Sep 2009 11:08:01 +0000 (19:08 +0800)]
Remove CameraSettings. And then renmae CameraSettingsHelper to CameraSettings
Change-Id: I515c90bb5c4d49a2c4a761a933c0db6fbec0637b
Owen Lin [Fri, 11 Sep 2009 15:43:43 +0000 (23:43 +0800)]
Remove switch menu item in both Camera and Camcorder.
Change-Id: Ic55eb043e78cc6ed7c5fea5d0a88937e964f739e
Owen Lin [Thu, 10 Sep 2009 06:43:42 +0000 (14:43 +0800)]
Enable the on-screen settings in Camcorder and also use different settings
in Camera and Camcorder.
Change-Id: I2444a2c8f7a040b2b5fc449df0fc988fba1b7aaf
Android (Google) Code Review [Fri, 11 Sep 2009 08:00:11 +0000 (04:00 -0400)]
Merge change 24648 into eclair
* changes:
Add messages to help debug
2113527.
Chih-Chung Chang [Fri, 11 Sep 2009 03:52:31 +0000 (11:52 +0800)]
Add messages to help debug
2113527.
Change-Id: I964bb8a02831a1bd89d1c74dd26283cafec9dc78
Wu-cheng Li [Thu, 10 Sep 2009 08:27:00 +0000 (16:27 +0800)]
Do not reset zoom to 1x after snapshot.
Android (Google) Code Review [Thu, 10 Sep 2009 09:50:07 +0000 (05:50 -0400)]
Merge change 24507 into eclair
* changes:
Add double tap to zoom.
Chih-Chung Chang [Thu, 10 Sep 2009 04:36:52 +0000 (12:36 +0800)]
Add double tap to zoom.
Change-Id: I11ea02685bb27b33eb73c11bea9918b5fa02e186
Chih-Chung Chang [Thu, 10 Sep 2009 09:17:15 +0000 (17:17 +0800)]
Fix
2101273: "Gallery" Text is missing in select video to upload contextual menu
Change-Id: I9873861fabcffd2418a5b6b02d515fc935f25f22
Chih-Chung Chang [Tue, 8 Sep 2009 06:36:48 +0000 (14:36 +0800)]
Remove menu items already covered by the side buttons.
Change-Id: Ieae9f61e9e18f57b8ba8ac506e3fa50b210b555f
Android (Google) Code Review [Thu, 10 Sep 2009 04:27:40 +0000 (00:27 -0400)]
Merge change 24373 into eclair
* changes:
Fix bug
2106774.
Wu-cheng Li [Wed, 9 Sep 2009 10:24:03 +0000 (18:24 +0800)]
Mark non-translatable strings to translatable="false".
b2054300
Owen Lin [Wed, 9 Sep 2009 10:39:38 +0000 (18:39 +0800)]
Fix bug
2106774.
It seems to be a problem that we recieved the camera hardware button while
camera application is running.
Change-Id: I67dd2233e38ef530e55c116c2c70f37d026b5530
Owen Lin [Tue, 8 Sep 2009 09:03:07 +0000 (17:03 +0800)]
Add scene mode preference in camera.
Change-Id: I56fe3a1fc942f18faefbbc06d0fdac013c791ed6
President Li [Thu, 2 Apr 2009 09:38:09 +0000 (02:38 -0700)]
Cherry pick two commits that implements color effect and white-balance
settings and then make it workable.
Change-Id: I519bff761db4b2b0acc1a61a8f901fafcd4b2586
Wu-cheng Li [Tue, 8 Sep 2009 07:18:39 +0000 (15:18 +0800)]
Set optimal preview size.
Eric Fischer [Tue, 8 Sep 2009 23:26:23 +0000 (16:26 -0700)]
Import revised translations. DO NOT MERGE
Chih-Chung Chang [Tue, 8 Sep 2009 05:32:52 +0000 (13:32 +0800)]
Clean menu creation code.
Change-Id: Ie8ed04e74beef78208946688ee2f33297de0b6d1
Wu-cheng Li [Tue, 8 Sep 2009 04:21:52 +0000 (12:21 +0800)]
Reset frame rate to maximum in camera app.