OSDN Git Service
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.
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.
Chih-Chung Chang [Mon, 7 Sep 2009 12:17:12 +0000 (20:17 +0800)]
Clean menu helper code.
Change-Id: I8c009ad9c340d7267e9d1cf43b6fc1513d44eb21
Chih-Chung Chang [Mon, 7 Sep 2009 10:51:47 +0000 (18:51 +0800)]
Fix
1977974: For photos without location data, don't offer to "Show on Maps"
Change-Id: I7445e365ad9158312149dc80cf73361655171ba2
Chih-Chung Chang [Fri, 4 Sep 2009 11:46:14 +0000 (19:46 +0800)]
Code clean up.
Change-Id: I8814d8482df5709b03ef105f547f4981db34919a
Owen Lin [Tue, 1 Sep 2009 06:51:53 +0000 (14:51 +0800)]
First version of on-screen settings for Camera.
Change-Id: I6e608b5b2d02abf3d1901160adba188399b03542
Owen Lin [Fri, 4 Sep 2009 06:49:05 +0000 (14:49 +0800)]
Use SEND instenad of SEND_MULTIPLE if only one image/video
is selected.
Change-Id: I5136194cb6cd88cc2224c34e770e714d1dbe4e5a
Chih-Chung Chang [Fri, 4 Sep 2009 10:41:13 +0000 (18:41 +0800)]
Change Cancelable to method call directly.
Change-Id: Id4396646e82593d9a40b3552dd2c6cd8146b29eb
Chih-Chung Chang [Fri, 4 Sep 2009 07:54:50 +0000 (15:54 +0800)]
Make the grid view thumbnails smooth by using FILTER_BITMAP_FLAG.
Change-Id: Ie4242d8f5729dde920cec1ffa510761bc0c890ad
Android (Google) Code Review [Thu, 3 Sep 2009 21:13:56 +0000 (14:13 -0700)]
Merge change 23873 into eclair
* changes:
When resuming MovieView after a pause, don't autoresume, but show the media controller instead.
Marco Nelissen [Thu, 3 Sep 2009 20:41:25 +0000 (13:41 -0700)]
When resuming MovieView after a pause, don't autoresume, but
show the media controller instead.
Wu-cheng Li [Thu, 3 Sep 2009 08:28:22 +0000 (16:28 +0800)]
Add double tap to control digital zoom.
Double tap to zoom in to the maximum. Double tap again to zoom out to the minimum.
b1977072
Wu-cheng Li [Wed, 2 Sep 2009 08:53:37 +0000 (16:53 +0800)]
Use continous zoom.
Eric Fischer [Tue, 1 Sep 2009 18:49:05 +0000 (11:49 -0700)]
Mark the untranslatable Camera arrays as translatable="false".
The magic comment is "do not translate", not "do not localize",
so these were still getting sent over for translations.
Android (Google) Code Review [Wed, 2 Sep 2009 10:34:13 +0000 (03:34 -0700)]
Merge change 23616 into eclair
* changes:
Fix bug
2078592.
Owen Lin [Wed, 2 Sep 2009 10:03:42 +0000 (18:03 +0800)]
Remove trailing spaces.
Change-Id: I80feb1b58c148b35b2666ef08d4b13d5aa0608b2
Owen Lin [Wed, 2 Sep 2009 08:25:08 +0000 (16:25 +0800)]
Fix bug
2078592.
This bug is that the touch event location should be traslated to be related
to the "owner view" of the zoom control. However, we didn't do that. So, there
is a shift of the location in the event object.
We tried to detect if user has touched on the zoom buttons and then keep those
on-screen controls (including zoom buttons) shown. Now, we fix this bug by
changing the logic to "if user has touched the screen while those on-screen
controls are visilbe" then we keep those controls on screen.
Change-Id: I3664c47d308a76afc7d8746da8bbbc1f3afbf7ac
Android (Google) Code Review [Wed, 2 Sep 2009 09:03:14 +0000 (02:03 -0700)]
Merge change 23255 into eclair
* changes:
Use new parameters API.
Wu-cheng Li [Wed, 2 Sep 2009 08:33:59 +0000 (16:33 +0800)]
Use new parameters API.
Chih-Chung Chang [Wed, 2 Sep 2009 05:25:02 +0000 (13:25 +0800)]
Remove camcorder launcher icon and unused permissions.
Change-Id: Iac72ccf0147ab15ef64dc285ff4506a9a067bdee
Chih-Chung Chang [Tue, 1 Sep 2009 05:26:14 +0000 (13:26 +0800)]
Fix
2066449: Align aspect ratio of the UI layout for video/image capture aplication
Change-Id: Ic51f6d670a8cfc692dd52e2221a4cde8d8e6f4a4
Android (Google) Code Review [Tue, 1 Sep 2009 04:31:24 +0000 (21:31 -0700)]
Merge change 23279 into eclair
* changes:
Make the video duration preference text depend on the system property.
Chih-Chung Chang [Mon, 31 Aug 2009 12:02:55 +0000 (20:02 +0800)]
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
Android (Google) Code Review [Tue, 1 Sep 2009 03:25:19 +0000 (20:25 -0700)]
Merge change 23269 into eclair
* changes:
Fix
2068807: Runtime Exception in viewing DRM images downloaded by the browser.
Wu-cheng Li [Mon, 31 Aug 2009 11:31:59 +0000 (19:31 +0800)]
Add zoom UI.
Chih-Chung Chang [Mon, 31 Aug 2009 06:47:24 +0000 (14:47 +0800)]
Fix
2068807: Runtime Exception in viewing DRM images downloaded by the browser.
Change-Id: Iadbf89f53ff75ea788af2099ac09a6883353ad2d
Chih-Chung Chang [Mon, 31 Aug 2009 03:14:15 +0000 (11:14 +0800)]
Remove unused code.
Change-Id: I848708a594ee58adad404ae3c67257e74cc18e58
Owen Lin [Tue, 18 Aug 2009 05:33:49 +0000 (13:33 +0800)]
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
Android (Google) Code Review [Mon, 31 Aug 2009 03:39:36 +0000 (20:39 -0700)]
Merge change 23088 into eclair
* changes:
Fix
2059728: NPE in BaseImageList.getCursor
Android (Google) Code Review [Fri, 28 Aug 2009 20:16:10 +0000 (13:16 -0700)]
Merge change 23138 into eclair
* changes:
High-resolution (hdpi) artwork from TAT for Camera.
Android (Google) Code Review [Fri, 28 Aug 2009 20:00:09 +0000 (13:00 -0700)]
Merge change 23025 into eclair
* changes:
Armor string format tokens with translation placeholders.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Camera.
Eric Fischer [Fri, 28 Aug 2009 00:23:59 +0000 (17:23 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: I440a3791eaa7f371b411cfe1cfbc4021b9d02a6e
Android (Google) Code Review [Fri, 28 Aug 2009 14:55:48 +0000 (07:55 -0700)]
Merge change 23085 into eclair
* changes:
Fix the bug flash is fired when the setting is off.
Chih-Chung Chang [Fri, 28 Aug 2009 12:14:42 +0000 (20:14 +0800)]
Fix
2059728: NPE in BaseImageList.getCursor
Return an empty image list if the cursor is not available.
Change-Id: Ib9f0b23668da7b3c29d208bd46c020e268a0b7f2
Wu-cheng Li [Fri, 28 Aug 2009 10:43:01 +0000 (18:43 +0800)]
Fix the bug flash is fired when the setting is off.
b2083478
Chih-Chung Chang [Fri, 28 Aug 2009 08:21:16 +0000 (16:21 +0800)]
Fix
2083639: Crash on Camera while previewing an attachment through Email/gmail/browser app
Change-Id: I69ca1ae148070d3428d3488416308431c82a103c
Dianne Hackborn [Thu, 27 Aug 2009 23:52:10 +0000 (16:52 -0700)]
Add new <uses-feature> decls for the camera.
Change-Id: I0c1be1b28c0467f3d9fe206bd75843aee10fac4c
Chih-Chung Chang [Thu, 27 Aug 2009 09:12:14 +0000 (17:12 +0800)]
Remove unused code.
Change-Id: I15624339790bffb078238c5a5870779dc4aa1b78
Chih-Chung Chang [Wed, 26 Aug 2009 18:41:16 +0000 (11:41 -0700)]
am
c0e0633f: Remove unused library.
Merge commit '
c0e0633f10c9f2ac1c787c879cc30d36477a1000' into eclair
* commit '
c0e0633f10c9f2ac1c787c879cc30d36477a1000':
Remove unused library.
Chih-Chung Chang [Wed, 26 Aug 2009 11:16:31 +0000 (19:16 +0800)]
Remove unused library.
This should save about 30k (uncompressed) on the user build.
The library was used for the uploader, but the code has long since been removed.
Chih-Chung Chang [Wed, 26 Aug 2009 08:12:34 +0000 (16:12 +0800)]
Style fix.
Change-Id: I09ba86ee314e643415e41879c1d20ab1ede65a91
Chih-Chung Chang [Tue, 25 Aug 2009 10:28:29 +0000 (18:28 +0800)]
Create ImageListParam as a spec for creating image lists.
Also merge deactivate() and close().
Change-Id: Idc76eda25bfcefab949e46412dca366228b3f437
Chih-Chung Chang [Wed, 26 Aug 2009 06:33:56 +0000 (14:33 +0800)]
Remove "Select" in the setting titles.
Chih-Chung Chang [Tue, 25 Aug 2009 05:42:04 +0000 (13:42 +0800)]
Fix
1993400: Use the max recording duration parameter.
Chih-Chung Chang [Mon, 24 Aug 2009 09:58:49 +0000 (17:58 +0800)]
Show setting wallpaper message in crop image.
Chih-Chung Chang [Mon, 24 Aug 2009 08:42:21 +0000 (16:42 +0800)]
Fix
1559583: Unnecessary image is created when setting a wallpaper
Chih-Chung Chang [Mon, 24 Aug 2009 06:56:04 +0000 (14:56 +0800)]
Missing icons for the previous change.
Chih-Chung Chang [Fri, 21 Aug 2009 11:25:48 +0000 (19:25 +0800)]
Add on-screen flash button.
Chih-Chung Chang [Wed, 19 Aug 2009 07:52:32 +0000 (15:52 +0800)]
Fix
2052451: recycle bitmap memory as soon as possible so we won't be out-of-memory.
Android (Google) Code Review [Wed, 19 Aug 2009 04:48:56 +0000 (21:48 -0700)]
Merge change 21254 into eclair
* changes:
Fix the warnings shown in Eclipse. That is, removing unused field, replace deprecated methods, and removing unused imports.
Owen Lin [Thu, 13 Aug 2009 10:04:45 +0000 (18:04 +0800)]
Fix the warnings shown in Eclipse. That is, removing unused field,
replace deprecated methods, and removing unused imports.
Android (Google) Code Review [Wed, 19 Aug 2009 03:10:54 +0000 (20:10 -0700)]
Merge change 21482 into eclair
* changes:
The DATE_TAKEN field is in milliseconds, but DATE_MODIFIED is in seconds.
Eric Fischer [Tue, 18 Aug 2009 18:00:36 +0000 (11:00 -0700)]
am
cca256bc: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
cca256bc7b28c627531718716ade95fb3db2b74c' into eclair
* commit '
cca256bc7b28c627531718716ade95fb3db2b74c':
Import revised translations. DO NOT MERGE
Owen Lin [Tue, 18 Aug 2009 17:59:41 +0000 (10:59 -0700)]
am
d1be9ce5: (-s ours) Open Google Maps by default for "Show on map". DO NOT MERGE
Merge commit '
d1be9ce511cf5dafdac2c6ea39863dca377bca92' into eclair
* commit '
d1be9ce511cf5dafdac2c6ea39863dca377bca92':
Open Google Maps by default for "Show on map". DO NOT MERGE
Eric Fischer [Mon, 17 Aug 2009 20:14:35 +0000 (13:14 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Mon, 17 Aug 2009 18:50:50 +0000 (11:50 -0700)]
Merge change 21350 into eclair
* changes:
fixed encoder type string from mp4 to m4v
Chih-Chung Chang [Mon, 17 Aug 2009 11:47:02 +0000 (19:47 +0800)]
The DATE_TAKEN field is in milliseconds, but DATE_MODIFIED is in seconds.
We need to scale them before sorting.
Owen Lin [Fri, 14 Aug 2009 06:24:23 +0000 (14:24 +0800)]
Open Google Maps by default for "Show on map". DO NOT MERGE
This will solve an issue that browser will crash when open the http URL for map.
(bug
2039537). But we need to use these kind of intent for GMM to show a marker
on map. So, we change the code to open it with GMM first. If GMM is not installed,
we will use others who can handle the "geo:lat,lng" intent.
Snigdha [Thu, 6 Aug 2009 20:06:00 +0000 (15:06 -0500)]
fixed encoder type string from mp4 to m4v
Chih-Chung Chang [Thu, 13 Aug 2009 07:48:22 +0000 (15:48 +0800)]
Fix
2039004: "Camera settings" from review screens irrelevant to Camera or Camcorder
Chih-Chung Chang [Thu, 13 Aug 2009 11:56:30 +0000 (19:56 +0800)]
Fix
1860351: Gallery does not sort Camera photos by date.
For sorting, look at date_modified field if the datetaken field is null.