OSDN Git Service
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
Marco Nelissen [Wed, 30 Sep 2009 23:31:48 +0000 (16:31 -0700)]
When discarding an empty image list, we need to close it first, otherwise we end up leaking Cursors
Ray Chen [Wed, 30 Sep 2009 21:33:15 +0000 (14:33 -0700)]
Utilize thumbnail api to cancel thumbnail decoding, and replace BitmapManager's existing functions with BitmapFactory.
Cheng-Ru Lin [Wed, 30 Sep 2009 07:40:33 +0000 (15:40 +0800)]
Hide the settings when user presses the camera button.
Change-Id: Id43bcf2f7173d5a37134448f6c4a633ea06412b8
Android (Google) Code Review [Wed, 30 Sep 2009 21:34:37 +0000 (17:34 -0400)]
Merge change I12b84853 into eclair
* changes:
Another candidate for on screen settings UI (opaque).
Cheng-Ru Lin [Wed, 30 Sep 2009 07:35:43 +0000 (15:35 +0800)]
Another candidate for on screen settings UI (opaque).
Make the background opaque and use slide from the whole
screen (not just inside the view finder).
Change-Id: I12b8485399553e2622c9917833dc9aca9d8ee59c
Eric Fischer [Wed, 30 Sep 2009 19:01:27 +0000 (12:01 -0700)]
resolved conflicts for merge of
4bc220ac to eclair
Eric Fischer [Wed, 30 Sep 2009 17:52:41 +0000 (10:52 -0700)]
Mark the untranslatable Camera arrays as translatable="false".
Fixes P0 bug
2156910 that made it impossible to enter Camera settings
in German or French.
Change-Id: I594aa08a846a3421b206b9cdba72dbe4624fde35
Android (Google) Code Review [Wed, 30 Sep 2009 16:55:42 +0000 (12:55 -0400)]
Merge change I65b13222 into eclair
* changes:
Fine tune some UI stuff.
The Android Open Source Project [Wed, 30 Sep 2009 15:37:22 +0000 (08:37 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Android (Google) Code Review [Wed, 30 Sep 2009 08:30:45 +0000 (04:30 -0400)]
Merge change If18f9e03 into eclair
* changes:
Newer icons
Mike Cleron [Wed, 30 Sep 2009 08:12:26 +0000 (01:12 -0700)]
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 06:42:56 +0000 (02:42 -0400)]
Merge change I697e45f9 into eclair
* changes:
Try some mock icons to feel the layout.
Cheng-Ru Lin [Wed, 30 Sep 2009 03:57:50 +0000 (11:57 +0800)]
Fine tune some UI stuff.
1. Use no animation between camera / review mode. Thus, we must have same
layout for three types of control panel.
2. Since we have better algorithm to calculate the preview size. Let the
gripper be the same in mdpi and hdpi devices.
3. Keep some border on the right size of image view. Otherwise, it looks
odds in HVGA devices.
Change-Id: I65b13222cace230f09e6b33f311fd2b79758e93e
Cheng-Ru Lin [Wed, 30 Sep 2009 05:48:59 +0000 (13:48 +0800)]
Try some mock icons to feel the layout.
Change-Id: I697e45f93e0c6592bdd812f84d5db189f8cf6b4d
Android (Google) Code Review [Wed, 30 Sep 2009 03:55:16 +0000 (23:55 -0400)]
Merge change I1fd58eb1 into eclair
* changes:
Make video record counter run more smooth.
b2154768
Wu-cheng Li [Wed, 30 Sep 2009 03:29:49 +0000 (20:29 -0700)]
Make video record counter run more smooth.
b2154768
Android (Google) Code Review [Wed, 30 Sep 2009 00:51:17 +0000 (20:51 -0400)]
Merge change I836b5217 into eclair
* changes:
Remove unused progress indicator.
Chih-Chung Chang [Wed, 30 Sep 2009 00:41:18 +0000 (17:41 -0700)]
Remove unused progress indicator.
Wu-cheng Li [Tue, 29 Sep 2009 23:40:19 +0000 (16:40 -0700)]
Add debug message for
b2149363.
Android (Google) Code Review [Tue, 29 Sep 2009 22:22:06 +0000 (18:22 -0400)]
Merge change I02b644bf into eclair
* changes:
Fix
2153860: VideoCamera app have to set scene mode to auto
Cheng-Ru Lin [Tue, 29 Sep 2009 20:37:18 +0000 (04:37 +0800)]
Revert "Add icon support for options in preference setting screen."
This reverts commit
723f84eadb3c1a79337ef20e4d0a014341537adb.
Conflicts:
res/values/arrays.xml
res/xml/camera_preferences.xml
src/com/android/camera/IconListPreference.java
Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
Chih-Chung Chang [Tue, 29 Sep 2009 21:27:59 +0000 (14:27 -0700)]
Fix
2153860: VideoCamera app have to set scene mode to auto
Android (Google) Code Review [Tue, 29 Sep 2009 20:14:30 +0000 (16:14 -0400)]
Merge change Ib74a9fe6 into eclair
* changes:
New icons
Mike Cleron [Tue, 29 Sep 2009 20:04:28 +0000 (13:04 -0700)]
New icons
Wei-Ta Chen [Tue, 29 Sep 2009 01:38:05 +0000 (18:38 -0700)]
Fix b/
2144865 by re-positioning the on-screen setting when the size of preview frame is changed.
The Android Open Source Project [Tue, 29 Sep 2009 15:37:13 +0000 (08:37 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Mike Cleron [Tue, 29 Sep 2009 07:05:59 +0000 (00:05 -0700)]
New icons
Chih-Chung Chang [Tue, 29 Sep 2009 00:57:55 +0000 (17:57 -0700)]
Remove unused code.
Chih-Chung Chang [Mon, 28 Sep 2009 21:36:37 +0000 (14:36 -0700)]
Fix
2150684: Set frame rate according to encoder fps in video camera app
Wu-cheng Li [Mon, 28 Sep 2009 03:45:42 +0000 (20:45 -0700)]
Add zoom UI back.
Cheng-Ru Lin [Mon, 28 Sep 2009 04:34:33 +0000 (12:34 +0800)]
Hide indicator when on-screen settings is shown.
Change-Id: Ib37df275a584133b326161fa5fe371697f31f8d1
Cheng-Ru Lin [Sun, 27 Sep 2009 19:21:25 +0000 (03:21 +0800)]
Resize the preview frame as large as possible.
Now, we will calculate the layout by ourselves in PreviewFrameLayout.
Change-Id: I90f91f9df6d2f75fbd31fc930af624a84820bc95
Android (Google) Code Review [Mon, 28 Sep 2009 18:34:53 +0000 (14:34 -0400)]
Merge change 27454 into eclair
* changes:
Remove unused resources / strings.
Cheng-Ru Lin [Mon, 28 Sep 2009 14:54:13 +0000 (22:54 +0800)]
Remove unused resources / strings.
Change-Id: If0c6005b9ede76293260e3748ae38f9dcfa608fa
Chih-Chung Chang [Mon, 28 Sep 2009 17:47:18 +0000 (10:47 -0700)]
Fix orientation not stored in the database.
The Android Open Source Project [Mon, 28 Sep 2009 15:33:32 +0000 (08:33 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Wei-Ta Chen [Sun, 27 Sep 2009 23:20:23 +0000 (16:20 -0700)]
Fix b/
2149062 by showing on-screen setting when clicking the menu key.
Android (Google) Code Review [Mon, 28 Sep 2009 01:31:39 +0000 (21:31 -0400)]
Merge change 27210 into eclair
* changes:
Fix style issues in on-screen settings.
Wu-cheng Li [Mon, 28 Sep 2009 01:03:50 +0000 (18:03 -0700)]
VideoCamera should crash if media recorder prepare fails.
b2143881
Cheng-Ru Lin [Sat, 26 Sep 2009 01:34:27 +0000 (09:34 +0800)]
Fix style issues in on-screen settings.
1. Make the item as high as 64dp.
2. Move the title of the second level menu to the left
3. Change 5M to 5M pixel
4. Enlarge the viewfinder and also review image
Change-Id: Iad0e05df168336ac6c80124d9b24e0e1acbfdf3e
Ray Chen [Fri, 25 Sep 2009 22:33:49 +0000 (15:33 -0700)]
Fix issue
2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
Ray Chen [Sun, 27 Sep 2009 22:39:55 +0000 (15:39 -0700)]
Fix the camera directory path issue.
Wei-Ta Chen [Sat, 26 Sep 2009 00:23:22 +0000 (17:23 -0700)]
Fix b/
2144590 by honoring Intent's content when provisioning options in on-screen settings.
Android (Google) Code Review [Sun, 27 Sep 2009 18:56:06 +0000 (14:56 -0400)]
Merge change 27149 into eclair
* changes:
Fix issue
2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
Ray Chen [Fri, 25 Sep 2009 22:33:49 +0000 (15:33 -0700)]
Fix issue
2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
Android (Google) Code Review [Sun, 27 Sep 2009 18:53:55 +0000 (14:53 -0400)]
Merge change 27277 into eclair
* changes:
Fix
2145283: Two context menus show up when long press on the center key.
Ray Chen [Fri, 25 Sep 2009 20:43:31 +0000 (13:43 -0700)]
Fix
2145588 jhead reports "Not JPEG"
Chih-Chung Chang [Sun, 27 Sep 2009 18:45:07 +0000 (11:45 -0700)]
Fix
2145283: Two context menus show up when long press on the center key.
Android (Google) Code Review [Sun, 27 Sep 2009 18:10:36 +0000 (14:10 -0400)]
Merge change 27145 into eclair
* changes:
Fix
2147286: Camera app should handle back key in onKeyUp
Cheng-Ru Lin [Sat, 26 Sep 2009 02:07:33 +0000 (10:07 +0800)]
Remove unused string in i18n resources directoy.
Expect a merge-fail in master. Will solve the conflict later.
Change-Id: I20ab9fddb7fe67e6a60cce33bfa949b7842454d2
Cheng-Ru Lin [Fri, 25 Sep 2009 20:46:06 +0000 (04:46 +0800)]
Change the checkbox style to list style for record location preference.
Change-Id: Ie209887169623f090df0ee7a85f2709b4a54e202
Chih-Chung Chang [Fri, 25 Sep 2009 22:12:14 +0000 (15:12 -0700)]
Fix
2147286: Camera app should handle back key in onKeyUp
Android (Google) Code Review [Fri, 25 Sep 2009 21:51:01 +0000 (17:51 -0400)]
Merge change 27109 into eclair
* changes:
Show the thumbnail box even if there is no picture taken yet.
Wu-cheng Li [Fri, 25 Sep 2009 20:54:53 +0000 (13:54 -0700)]
Remove zoom UI.
Android (Google) Code Review [Fri, 25 Sep 2009 20:49:09 +0000 (16:49 -0400)]
Merge change 26945 into eclair
* changes:
Change the default settings of picture size to the largest one.
Android (Google) Code Review [Fri, 25 Sep 2009 20:48:26 +0000 (16:48 -0400)]
Merge change 27107 into eclair
* changes:
Change the close behavior of on screen menu.
Owen Lin [Sat, 19 Sep 2009 11:50:42 +0000 (19:50 +0800)]
Change the default settings of picture size to the largest one.
This fix issue: http://b/
2140738.
Change-Id: I9d92370897df7fe392801baa068913728c7d2ffc