OSDN Git Service
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Yu Shan Emily Lau [Mon, 25 Jan 2010 21:57:12 +0000 (13:57 -0800)]
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
The Android Open Source Project [Tue, 12 Jan 2010 23:19:09 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
The Android Automerger [Thu, 10 Dec 2009 17:01:48 +0000 (09:01 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Thu, 10 Dec 2009 01:25:08 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
The Android Automerger [Thu, 3 Dec 2009 17:00:02 +0000 (09:00 -0800)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Wed, 2 Dec 2009 22:55:57 +0000 (14:55 -0800)]
Import revised translations. DO NOT MERGE
The Android Automerger [Tue, 1 Dec 2009 17:06:38 +0000 (09:06 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Mon, 30 Nov 2009 20:22:44 +0000 (12:22 -0800)]
Merge change I94d56d71 into eclair
* changes:
Split the startup measurment into two parts. 1) The first startup time 2) The average of the rest of the iterations ( ie. 19)
Eric Fischer [Mon, 30 Nov 2009 19:35:19 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Sat, 21 Nov 2009 02:25:52 +0000 (18:25 -0800)]
Split the startup measurment into two parts.
1) The first startup time
2) The average of the rest of the iterations ( ie. 19)
The Android Automerger [Mon, 23 Nov 2009 17:28:59 +0000 (09:28 -0800)]
Merge branch 'eclair' into eclair-release
The Android Automerger [Fri, 20 Nov 2009 23:02:21 +0000 (15:02 -0800)]
Merge branch 'eclair' into eclair-release
Owen Lin [Fri, 20 Nov 2009 08:20:09 +0000 (16:20 +0800)]
Fix black screen after resuming camera.
Fix the issue that if surfaceChanged is called before onResume().
The new holder will be ignore and we will set null to the preview
display of the camera.
Change-Id: Ic563284e6302f4d174226297d1372c4ed349a084
http://b/
2269582
Owen Lin [Thu, 19 Nov 2009 05:24:55 +0000 (13:24 +0800)]
Keep space for those empty icons but hide them if the feature is not
supported.
fix bug: http://b/
2250438
Change-Id: I79eb9d575cf275c25decc6236b80f61ecfdf3042
The Android Automerger [Thu, 19 Nov 2009 18:23:13 +0000 (10:23 -0800)]
Merge branch 'eclair' into eclair-release
The Android Automerger [Wed, 18 Nov 2009 16:48:32 +0000 (08:48 -0800)]
Merge branch 'eclair' into eclair-release
Owen Lin [Tue, 17 Nov 2009 09:47:22 +0000 (17:47 +0800)]
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
Ray Chen [Tue, 17 Nov 2009 00:36:21 +0000 (16:36 -0800)]
Fix
2265947 Blank screen when invoking gallery view intent from camera
http://b/
2265947
The Android Automerger [Tue, 17 Nov 2009 16:55:06 +0000 (08:55 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Tue, 17 Nov 2009 07:31:12 +0000 (23:31 -0800)]
Merge change Ie07be885 into eclair
* changes:
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
Ray Chen [Mon, 16 Nov 2009 22:43:29 +0000 (14:43 -0800)]
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
The Android Automerger [Tue, 17 Nov 2009 02:33:34 +0000 (18:33 -0800)]
Merge branch 'eclair' into eclair-release
Yu Shan Emily Lau [Tue, 17 Nov 2009 02:08:27 +0000 (18:08 -0800)]
Trun on the log to see what causing the failure
Yu Shan Emily Lau [Mon, 16 Nov 2009 22:49:52 +0000 (14:49 -0800)]
Increse the wait time for image capture.
The Android Automerger [Mon, 16 Nov 2009 16:55:10 +0000 (08:55 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Mon, 16 Nov 2009 04:38:05 +0000 (20:38 -0800)]
Merge change I25b0edfa into eclair
* changes:
Hide the indicator if the icon is empty.
The Android Automerger [Sun, 15 Nov 2009 17:05:33 +0000 (09:05 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Sat, 14 Nov 2009 01:44:09 +0000 (17:44 -0800)]
Merge change I5bf68698 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:16:14 +0000 (17:16 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Yu Shan Emily Lau [Fri, 13 Nov 2009 22:40:48 +0000 (14:40 -0800)]
Re-submit the change and make sure the test target can pick it up.
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:08 +0000 (18:46 -0800)]
eclair snapshot
The Android Automerger [Thu, 12 Nov 2009 16:33:25 +0000 (08:33 -0800)]
Merge branch 'eclair' into eclair-release
Cheng-Ru Lin [Thu, 12 Nov 2009 03:48:46 +0000 (11:48 +0800)]
Hide the indicator if the icon is empty.
Also change the order of on-screen icons.
http://b/issue?id=
2250438
Change-Id: I25b0edfa1913aa3dacd960df87d5d7103e352bce
Cheng-Ru Lin [Thu, 12 Nov 2009 03:48:46 +0000 (11:48 +0800)]
Add icon-indicators to VideoCamera.
Change-Id: Ie5ace8cf1863636ffe94f89d70525483a95b3239
http://b/
2247081
Wu-cheng Li [Tue, 10 Nov 2009 10:32:09 +0000 (18:32 +0800)]
Add postview callback to know when the captured image is shown.
b2237074
Some platform display the captured image to the screen in postview callback.
Some do that in raw picture callback. The camera application wants to make
sure the captured image is displayed for at least 1.2 seconds. But orginally
the app does not register postview callback and always start the timer in
raw picture callback. Currently postview callback always arrives before raw
callback. Without this change, the camera app may think the captured image
is not displyed long enough and add some delay before starting preview,
which will increase the shot-to-shot latency (ex: 0.8s) unexpectedly.
The Android Automerger [Tue, 10 Nov 2009 16:46:07 +0000 (08:46 -0800)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Tue, 10 Nov 2009 03:15:19 +0000 (19:15 -0800)]
Merge change Ic823abd0 into eclair
* changes:
Fix
2241232: Read system properties for quality setting.
Yu Shan Emily Lau [Tue, 10 Nov 2009 00:05:09 +0000 (16:05 -0800)]
Changed the tag name.
Chih-Chung Chang [Mon, 9 Nov 2009 05:01:13 +0000 (13:01 +0800)]
Fix
2241232: Read system properties for quality setting.
Change-Id: Ic823abd0c352b3eca0b8ef504307bd1de7d1700f
The Android Automerger [Thu, 5 Nov 2009 16:41:53 +0000 (08:41 -0800)]
Merge branch 'eclair' into eclair-release
Owen Lin [Wed, 14 Oct 2009 05:48:50 +0000 (22:48 -0700)]
DO NOT MERGE TO MR2. Fix the focus settings is incorrect when switch back to auto scene mode.
http://b/editIssue?id=
2178247
Change-Id: Icae1d4f255106ef47766feb43481a37917e6e885
Android (Google) Code Review [Thu, 5 Nov 2009 09:14:23 +0000 (04:14 -0500)]
Merge change I834b0640 into eclair
* changes:
Remove whiteboard and blackboard color effects.
Wu-cheng Li [Thu, 5 Nov 2009 08:47:56 +0000 (16:47 +0800)]
Remove whiteboard and blackboard color effects.
Chih-Chung Chang [Wed, 4 Nov 2009 08:21:57 +0000 (16:21 +0800)]
Improve
2237074: Make preview start earlier.
Change-Id: I9d7416cfd7c9cbaa3bc135ac8fd67776ec1c65e3
The Android Automerger [Tue, 3 Nov 2009 21:35:52 +0000 (13:35 -0800)]
Merge branch 'eclair' into eclair-release
Wu-cheng Li [Mon, 2 Nov 2009 11:20:15 +0000 (19:20 +0800)]
Change white-balance string "cloudy" to "cloudy-daylight".
b2230804
The Android Automerger [Fri, 30 Oct 2009 16:45:45 +0000 (09:45 -0700)]
Merge branch 'eclair' into eclair-release
Wu-cheng Li [Fri, 30 Oct 2009 09:18:23 +0000 (17:18 +0800)]
Fix the bug that wrong zoom value is set in takePicture.
The application does not getParameters in takePicture due to performance.
After smooth zoom, zoom value has been changed. But mParameters of the app
still keeps the the old value. This is a regression.
b2226717
Cheng-Ru Lin [Thu, 29 Oct 2009 07:22:33 +0000 (00:22 -0700)]
Lift the upperbound of initial up-scaling.
http://b/issue?id=
2223577
Change-Id: I9af997b342b16c5c7bef58e779e1c9fdbb42ac92
The Android Automerger [Thu, 29 Oct 2009 06:57:07 +0000 (23:57 -0700)]
Merge branch 'eclair' into eclair-release
Eric Fischer [Thu, 29 Oct 2009 04:24:09 +0000 (21:24 -0700)]
Import revised translations. DO NOT MERGE
The Android Open Source Project [Mon, 26 Oct 2009 18:37:10 +0000 (11:37 -0700)]
Merge branch 'eclair' into eclair-release
The Android Open Source Project [Thu, 22 Oct 2009 15:30:21 +0000 (08:30 -0700)]
Merge branch 'eclair' into eclair-release
Wu-cheng Li [Wed, 21 Oct 2009 10:20:40 +0000 (18:20 +0800)]
Eric Fischer [Wed, 21 Oct 2009 17:43:24 +0000 (10:43 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
The Android Open Source Project [Wed, 21 Oct 2009 16:01:50 +0000 (09:01 -0700)]
Merge branch 'eclair' into eclair-release
Cheng-Ru Lin [Fri, 16 Oct 2009 07:07:29 +0000 (00:07 -0700)]
Chagne CropImage invocation to non-explicit.
Change-Id: I38d5e9bee524c5e63c2457751756ee800c9b1947
Cheng-Ru Lin [Fri, 16 Oct 2009 03:59:13 +0000 (20:59 -0700)]
Hide 2D gallery in launcher.
Hide 2D gallery in the launcher and also hide other activities of gallery
by removing their intent filter.
Change-Id: I401b1c032b4c519b666a61743bfc6814dbaa2724
Owen Lin [Mon, 19 Oct 2009 09:46:30 +0000 (02:46 -0700)]
Fix the bug that one-item only settings still shown on menu.
Change-Id: I6c57ed929f74d9f170b3e07c4db54134b2869e78
http://b/issue?id=
2196476
The Android Open Source Project [Tue, 20 Oct 2009 15:45:12 +0000 (08:45 -0700)]
Merge branch 'eclair' into eclair-release
Yu Shan Emily Lau [Fri, 16 Oct 2009 01:04:48 +0000 (18:04 -0700)]
Insert the wait time before collecting the last memory usage for image capture.
The Android Open Source Project [Tue, 13 Oct 2009 20:40:14 +0000 (13:40 -0700)]
Merge branch 'eclair' into eclair-release
Owen Lin [Tue, 13 Oct 2009 04:15:29 +0000 (12:15 +0800)]
Fix the layout of title in Gallery-Picker.
Bug number: http://b/issue?id=
2180043
Change-Id: Ic852a89f6ae6c5d950c8ea93e739d17bf51680f4
android-build SharedAccount [Wed, 7 Oct 2009 01:58:29 +0000 (18:58 -0700)]
Merge branch 'eclair' into eclair-release
Wu-cheng Li [Tue, 6 Oct 2009 01:47:46 +0000 (18:47 -0700)]
Adapt to new zoom callback.
b2060030
android-build SharedAccount [Tue, 6 Oct 2009 16:17:37 +0000 (09:17 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Tue, 6 Oct 2009 01:31:27 +0000 (21:31 -0400)]
Merge change I77245f28 into eclair
* changes:
Fix
2166632: Change of wording in Camera ->Video ->Settings
Chih-Chung Chang [Tue, 6 Oct 2009 00:45:59 +0000 (17:45 -0700)]
Fix
2166632: Change of wording in Camera ->Video ->Settings
Wu-cheng Li [Mon, 5 Oct 2009 22:23:01 +0000 (15:23 -0700)]
Fix the bug sometimes record counter does not increment.
b2167715
android-build SharedAccount [Mon, 5 Oct 2009 22:01:05 +0000 (15:01 -0700)]
Merge branch 'eclair' into eclair-release
Android (Google) Code Review [Mon, 5 Oct 2009 16:56:45 +0000 (12:56 -0400)]
Merge change I610062f6 into eclair
* changes:
Since string is freeze now. Change it to an existed one.
Dianne Hackborn [Sun, 4 Oct 2009 20:33:50 +0000 (13:33 -0700)]
Work on issue #
2163789: Way too much logging
Dr.No from mcleron.
Change-Id: I50abca4d0370d6fc7412ec7af6f154965ac23fad
Cheng-Ru Lin [Fri, 2 Oct 2009 23:46:56 +0000 (07:46 +0800)]
Since string is freeze now. Change it to an existed one.
About Bug:
2156915
Change-Id: I610062f6ec7635ff49c6c6af260afe4fac776f34
android-build SharedAccount [Sat, 3 Oct 2009 00:12:49 +0000 (17:12 -0700)]
Merge branch 'eclair' into eclair-release
Cheng-Ru Lin [Fri, 2 Oct 2009 18:05:13 +0000 (02:05 +0800)]
Temporally solve the overlay creation problem.
Fix bug: http://b/issue?id=
2153980
Because of bugs of overlay and layout, we sometimes will try to layout the
viewfinder in the portrait orientation and thus get the wrong size of
mSurfaceView. When we cange the size of preview size the new overlay will be
created before the old one closed, and cause an exception. For now, just get
the screen size
Change-Id: I3daf4bce801507aaaca1f030f09d6e18cb23f0f2
Android (Google) Code Review [Fri, 2 Oct 2009 22:12:06 +0000 (18:12 -0400)]
Merge change I8f184b8a into eclair
* changes:
Fix the issue that focus options shown on those device without focus support.
Cheng-Ru Lin [Fri, 2 Oct 2009 00:37:21 +0000 (08:37 +0800)]
Fix the issue that focus options shown on those device without focus support.
This is for bug http://b/
2161159
Change-Id: I8f184b8aa5040c19b4f82775b30a99fed4ca035c
Android (Google) Code Review [Fri, 2 Oct 2009 04:48:01 +0000 (00:48 -0400)]
Merge change If9f0b7b4 into eclair
* changes:
Import revised translations.
Eric Fischer [Thu, 1 Oct 2009 23:56:15 +0000 (16:56 -0700)]
Import revised translations.
Approver: jerryw
Cheng-Ru Lin [Thu, 1 Oct 2009 18:43:17 +0000 (02:43 +0800)]
Add support for passions 5MP resolution.
Change-Id: I95463ae9df159d97c08dbdae1c6bf95eb769af3c
android-build SharedAccount [Thu, 1 Oct 2009 15:43:42 +0000 (08:43 -0700)]
Merge commit 'goog/eclair' into eclair-release
Cheng-Ru Lin [Thu, 1 Oct 2009 06:02:04 +0000 (14:02 +0800)]
Make new color for on screen settings.
And also solve the divider disapear problem.
Change-Id: I2f61ee39eb3e179f7a227e56a5dd677e6f415a2d
Android (Google) Code Review [Thu, 1 Oct 2009 07:55:58 +0000 (03:55 -0400)]
Merge change I64280ec2 into eclair
* changes:
Fix some stupid bugs.
Android (Google) Code Review [Thu, 1 Oct 2009 06:01:52 +0000 (02:01 -0400)]
Merge change I4b11fc53 into eclair
* changes:
Make the app can be run on those phone without scene mode.
Cheng-Ru Lin [Thu, 1 Oct 2009 05:29:06 +0000 (13:29 +0800)]
Fix some stupid bugs.
Change-Id: I64280ec21677d84ac3ad6f29168bf9d3234d2194
Android (Google) Code Review [Thu, 1 Oct 2009 05:14:26 +0000 (01:14 -0400)]
Merge change Idbc7f6b1 into eclair
* changes:
Add debug messages for b/
2150734
Android (Google) Code Review [Thu, 1 Oct 2009 05:13:34 +0000 (01:13 -0400)]
Merge change I1bd69b86 into eclair
* changes:
Utilize thumbnail api to cancel thumbnail decoding, and replace BitmapManager's existing functions with BitmapFactory.
Cheng-Ru Lin [Thu, 1 Oct 2009 03:42:29 +0000 (11:42 +0800)]
Make the app can be run on those phone without scene mode.
Change-Id: I4b11fc532fcd531cc93537d6b07e76f0118bb801
Cheng-Ru Lin [Wed, 30 Sep 2009 21:51:22 +0000 (05:51 +0800)]
More complete support for scene mode.
Now, we will disable focus mode, white balance, and flash mode settings
if scene mode is not "auto". The current settings of scene mode on those
three preference will also reflect on indicators and on screen settings.
Change-Id: I55a20ec1d43b205e35d87185e70820e9c66e5cc6
Wei-Ta Chen [Thu, 1 Oct 2009 03:27:42 +0000 (20:27 -0700)]
Fixed b/
2157791 registering OnSharedPreferenceChangeListener
when on-screen settings are visible and unregistering it
when the on-screen settings are invisible.
Android (Google) Code Review [Thu, 1 Oct 2009 01:33:51 +0000 (21:33 -0400)]
Merge change Ifed529e2 into eclair
* changes:
Fix widgets
Mike Cleron [Thu, 1 Oct 2009 01:27:55 +0000 (18:27 -0700)]
Fix widgets
Cheng-Ru Lin [Wed, 30 Sep 2009 21:10:55 +0000 (05:10 +0800)]
Add icons in on screen menu for whitebalance and focus mode.
Change-Id: Ic10c68404a703279918c3a86473d364030affa8a
Cheng-Ru Lin [Wed, 30 Sep 2009 18:29:55 +0000 (02:29 +0800)]
Revert "Revert "Add icon support for options in preference setting screen.""
This reverts commit
7af25641ec401d9f669497bd401020f2cb5933ef.
Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
Cheng-Ru Lin [Wed, 30 Sep 2009 16:34:41 +0000 (00:34 +0800)]
Add indicator for focus, white balance, and scene mode.
Change-Id: Iead8a7a28aeaa07210fd56ecac1f6f6a74fee155
Android (Google) Code Review [Wed, 30 Sep 2009 23:44:05 +0000 (19:44 -0400)]
Merge change Id43bcf2f into eclair
* changes:
Hide the settings when user presses the camera button.
Android (Google) Code Review [Wed, 30 Sep 2009 23:43:48 +0000 (19:43 -0400)]
Merge change I00fa4098 into eclair
* changes:
When discarding an empty image list, we need to close it first, otherwise we end up leaking Cursors
Chih-Chung Chang [Wed, 30 Sep 2009 23:40:08 +0000 (16:40 -0700)]
Add debug messages for b/
2150734