OSDN Git Service
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.
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.
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.
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 [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
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
Chih-Chung Chang [Fri, 25 Sep 2009 20:32:17 +0000 (13:32 -0700)]
Show the thumbnail box even if there is no picture taken yet.
Cheng-Ru Lin [Fri, 25 Sep 2009 20:29:10 +0000 (04:29 +0800)]
Change the close behavior of on screen menu.
1. Click on back/menu will close the whole setting panel
2. Touch on anywhere outside the panel will also close the settings.
3. Remove the "Back" item in second level menu.
Change-Id: I015a0264b50f8abb29db1c4c5adfef07987630f1
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