OSDN Git Service
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.
Wei-Ta Chen [Fri, 14 Aug 2009 01:43:36 +0000 (18:43 -0700)]
Wei-Ta Chen [Wed, 12 Aug 2009 13:00:23 +0000 (21:00 +0800)]
Fix http://b/issue?id=
2048408.
(1) Set default maximum numbers of pixels for thumbails and mini thumbnails.
(2) Enfore computeSampleSize() to return a sample size that is either power of 2
or multiple of 8.
Android (Google) Code Review [Thu, 13 Aug 2009 03:08:40 +0000 (20:08 -0700)]
Merge change 20920
* changes:
Remove highlight mode for shutter button - bug
2015072.
Owen Lin [Wed, 12 Aug 2009 10:35:41 +0000 (18:35 +0800)]
Remove highlight mode for shutter button - bug
2015072.
Wu-cheng Li [Wed, 12 Aug 2009 03:36:49 +0000 (11:36 +0800)]
Play click sound while clicking on an image in ImageGallery.
b1307676
Wu-cheng Li [Mon, 3 Aug 2009 14:25:29 +0000 (22:25 +0800)]
Add flash mode setting.
Chih-Chung Chang [Mon, 10 Aug 2009 20:45:21 +0000 (13:45 -0700)]
am
781f55b2: Make the responsive region larger for the Picture/Video mode switch.
Merge commit '
781f55b23ec3c3f97189efaba9d214183109f769'
* commit '
781f55b23ec3c3f97189efaba9d214183109f769':
Make the responsive region larger for the Picture/Video mode switch.
Chih-Chung Chang [Mon, 10 Aug 2009 17:32:24 +0000 (01:32 +0800)]
resolved conflicts for merge of
382b384e to master
Chih-Chung Chang [Mon, 10 Aug 2009 09:00:52 +0000 (17:00 +0800)]
Make the responsive region larger for the Picture/Video mode switch.
Chih-Chung Chang [Thu, 6 Aug 2009 06:33:30 +0000 (14:33 +0800)]
Removed unused resources and code. See
2036961: build size too large.
repo syn && make -j4 [Fri, 7 Aug 2009 21:44:39 +0000 (14:44 -0700)]
am
1d5ec3cb: Merge change 20382 into donut
Merge commit '
1d5ec3cba971ecb2d49fef0640a221a30c707e49'
* commit '
1d5ec3cba971ecb2d49fef0640a221a30c707e49':
Fix issue
2039521: Pressing back key doesn't work.
Android (Google) Code Review [Fri, 7 Aug 2009 20:42:08 +0000 (13:42 -0700)]
Merge change 20382 into donut
* changes:
Fix issue
2039521: Pressing back key doesn't work.
Jeff Sharkey [Fri, 7 Aug 2009 05:57:50 +0000 (22:57 -0700)]
am
90b0749b: Adopt new AppWidget assets, per b/
2038594.
Merge commit '
90b0749beca5718fd4ece268297866deb7f42c10'
* commit '
90b0749beca5718fd4ece268297866deb7f42c10':
Adopt new AppWidget assets, per http://b/
2038594.
Jeff Sharkey [Fri, 7 Aug 2009 04:38:08 +0000 (21:38 -0700)]
Adopt new AppWidget assets, per http://b/
2038594.
repo syn && make -j4 [Fri, 7 Aug 2009 01:41:42 +0000 (18:41 -0700)]
Fix issue
2039521: Pressing back key doesn't work.
Owen Lin [Thu, 6 Aug 2009 09:13:32 +0000 (02:13 -0700)]
am
69bd2716: Hide controls when return from other activities.
Merge commit '
69bd2716384e95e42435268618c33902120ea8ea'
* commit '
69bd2716384e95e42435268618c33902120ea8ea':
Hide controls when return from other activities.
Owen Lin [Thu, 6 Aug 2009 07:29:34 +0000 (15:29 +0800)]
Hide controls when return from other activities.
Android (Google) Code Review [Thu, 6 Aug 2009 08:09:13 +0000 (01:09 -0700)]
Merge change 20235
* changes:
Fix layout for high dpi display.
Chih-Chung Chang [Thu, 6 Aug 2009 03:58:45 +0000 (11:58 +0800)]
Fix layout for high dpi display.
Android (Google) Code Review [Thu, 6 Aug 2009 05:49:46 +0000 (22:49 -0700)]
am
152be17f: Merge change 20231 into donut
Merge commit '
152be17f93e14d5de241f7b083b1a375e6929bb5'
* commit '
152be17f93e14d5de241f7b083b1a375e6929bb5':
Change the task affinity of Camcorder to be different as Camera.
Android (Google) Code Review [Thu, 6 Aug 2009 05:48:01 +0000 (22:48 -0700)]
Merge change 20231 into donut
* changes:
Change the task affinity of Camcorder to be different as Camera.
Owen Lin [Wed, 29 Jul 2009 05:45:42 +0000 (13:45 +0800)]
Add the function to share multiple items in gallery.
Owen Lin [Wed, 5 Aug 2009 09:08:17 +0000 (17:08 +0800)]
Change the task affinity of Camcorder to be different as Camera.
Chih-Chung Chang [Wed, 5 Aug 2009 09:09:24 +0000 (02:09 -0700)]
am
10df8d25: Fix
2033184: Crash on delete after downloading/previewing picture attachments.
Merge commit '
10df8d25c28228ab60385a8d60e908e3e356ab88'
* commit '
10df8d25c28228ab60385a8d60e908e3e356ab88':
Fix
2033184: Crash on delete after downloading/previewing picture attachments.
Chih-Chung Chang [Wed, 5 Aug 2009 08:17:38 +0000 (16:17 +0800)]
Fix
2033184: Crash on delete after downloading/previewing picture attachments.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Mon, 3 Aug 2009 23:42:55 +0000 (16:42 -0700)]
am
7397efce: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7397efce5e5d065a134cae8f2a048647f7b32c90'
* commit '
7397efce5e5d065a134cae8f2a048647f7b32c90':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:08:24 +0000 (16:08 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut
Android (Google) Code Review [Fri, 31 Jul 2009 14:49:32 +0000 (07:49 -0700)]
am
debc5123: Merge change 9125 into donut
Merge commit '
debc51233f0b2f3de06c494319fdab00585ad31e'
* commit '
debc51233f0b2f3de06c494319fdab00585ad31e':
Fix bug
2022547. Show zoom buttons only when click on photo area.
Android (Google) Code Review [Fri, 31 Jul 2009 14:46:57 +0000 (07:46 -0700)]
Merge change 9125 into donut
* changes:
Fix bug
2022547. Show zoom buttons only when click on photo area.
Wu-cheng Li [Fri, 31 Jul 2009 07:31:10 +0000 (00:31 -0700)]
am
6b6a6d59: Make CropImage always fullscreen.
Merge commit '
6b6a6d59ee9d4375a64265ff5e784f2356eabf96'
* commit '
6b6a6d59ee9d4375a64265ff5e784f2356eabf96':
Make CropImage always fullscreen.
Wu-cheng Li [Fri, 31 Jul 2009 06:29:08 +0000 (14:29 +0800)]
Make CropImage always fullscreen.
Owen Lin [Thu, 30 Jul 2009 02:23:30 +0000 (10:23 +0800)]
Fix bug
2022547. Show zoom buttons only when click on photo area.
Chih-Chung Chang [Fri, 31 Jul 2009 05:15:21 +0000 (22:15 -0700)]
am
048e9db0: Fix
2021864: NPE while saving picture in CropImage.
Merge commit '
048e9db023de286e9576b438d4c616a53773abc8'
* commit '
048e9db023de286e9576b438d4c616a53773abc8':
Fix
2021864: NPE while saving picture in CropImage.