OSDN Git Service

android-x86/packages-apps-Camera.git
14 years agoUse new focus mode API.
Wu-cheng Li [Mon, 21 Sep 2009 00:54:43 +0000 (08:54 +0800)]
Use new focus mode API.

14 years agoRemove trailing spaces for easier code review.
Ray Chen [Mon, 21 Sep 2009 18:05:58 +0000 (11:05 -0700)]
Remove trailing spaces for easier code review.

14 years agoFix 2130355: Enter camera settings when recording a video will cause the phone to...
Chih-Chung Chang [Sun, 20 Sep 2009 21:36:24 +0000 (05:36 +0800)]
Fix 2130355: Enter camera settings when recording a video will cause the phone to freeze and then reset

14 years agoFix a bug that we didn't check if flash modes is supported by current device.
Owen Lin [Mon, 21 Sep 2009 01:58:09 +0000 (09:58 +0800)]
Fix a bug that we didn't check if flash modes is supported by current device.

Change-Id: Iea47f6cba6f99975e0c463b9a52e69a8b6247eff

14 years agoMerge change 26045 into eclair
Android (Google) Code Review [Mon, 21 Sep 2009 00:55:00 +0000 (20:55 -0400)]
Merge change 26045 into eclair

* changes:
  Add checking before setting parameters of Camera hardware.

14 years agoMerge change 25726 into eclair
Android (Google) Code Review [Sun, 20 Sep 2009 23:27:45 +0000 (19:27 -0400)]
Merge change 25726 into eclair

* changes:
  Change how VideoCamera uses lock() due to API change.

14 years agoChange how VideoCamera uses lock() due to API change.
Wu-cheng Li [Fri, 18 Sep 2009 06:10:47 +0000 (14:10 +0800)]
Change how VideoCamera uses lock() due to API change.

14 years agoMerge change 26043 into eclair
Android (Google) Code Review [Sun, 20 Sep 2009 22:53:54 +0000 (18:53 -0400)]
Merge change 26043 into eclair

* changes:
  Fix bug 2121734 (better guess at size of photo widget)

14 years agoFix bug 2121734 (better guess at size of photo widget)
Mike Cleron [Sun, 20 Sep 2009 22:25:11 +0000 (15:25 -0700)]
Fix bug 2121734 (better guess at size of photo widget)

14 years agoFix http://b/2072260 by supporting navigation keys in both viewing and reviewing...
Wei-Ta Chen [Thu, 17 Sep 2009 11:10:08 +0000 (19:10 +0800)]
Fix b/2072260 by supporting navigation keys in both viewing and reviewing pictures.

14 years agoAdd checking before setting parameters of Camera hardware.
Owen Lin [Sat, 19 Sep 2009 14:12:48 +0000 (22:12 +0800)]
Add checking before setting parameters of Camera hardware.

It is possible that some features are not availalbe with newer
Camera driver. We add check for those unsupported features.

14 years agoUpdate Camera to use new ExifInterface API.
Chih-Chung Chang [Thu, 17 Sep 2009 10:09:49 +0000 (18:09 +0800)]
Update Camera to use new ExifInterface API.

Change-Id: I3e0f5dd1a34ad2cde59ed55733b4349bd4121a6e

14 years agoStart the intent in order to switch to video capture mode.
Yu Shan Emily Lau [Fri, 18 Sep 2009 16:07:46 +0000 (09:07 -0700)]
Start the intent in order to switch to video capture mode.

14 years agoSet focus mode to camera driver and add macro focus.
Wu-cheng Li [Fri, 18 Sep 2009 07:34:37 +0000 (15:34 +0800)]
Set focus mode to camera driver and add macro focus.

14 years agoMerge change 25719 into eclair
Android (Google) Code Review [Fri, 18 Sep 2009 07:32:41 +0000 (03:32 -0400)]
Merge change 25719 into eclair

* changes:
  Fix 2128896: The thumbnail generated is overlapped with previous thumbnail.

14 years agoMerge change 25724 into eclair
Android (Google) Code Review [Fri, 18 Sep 2009 07:28:38 +0000 (03:28 -0400)]
Merge change 25724 into eclair

* changes:
  Fix the bug that we show camea preference in camcorder.

14 years agoFix 2128896: The thumbnail generated is overlapped with previous thumbnail.
Chih-Chung Chang [Fri, 18 Sep 2009 06:22:13 +0000 (14:22 +0800)]
Fix 2128896: The thumbnail generated is overlapped with previous thumbnail.

Change-Id: I57048527912887a6f9ff10dbd59233fc73c0cc7b

14 years agoFix the bug that sometimes scene mode parameter is not set.
Wu-cheng Li [Fri, 18 Sep 2009 07:08:01 +0000 (15:08 +0800)]
Fix the bug that sometimes scene mode parameter is not set.

14 years agoFix the bug that we show camea preference in camcorder.
Owen Lin [Fri, 18 Sep 2009 06:50:58 +0000 (14:50 +0800)]
Fix the bug that we show camea preference in camcorder.

14 years agoSimplify the code. Change references of "@strings" to literals for those
Owen Lin [Thu, 17 Sep 2009 16:20:12 +0000 (00:20 +0800)]
Simplify the code. Change references of "@strings" to literals for those
non-translatable values.

Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:30:04 +0000 (14:30 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoFix the bug that sometimes zoom is not working.
Wu-cheng Li [Thu, 17 Sep 2009 10:07:34 +0000 (18:07 +0800)]
Fix the bug that sometimes zoom is not working.

14 years agoMerge change 25456 into eclair
Android (Google) Code Review [Thu, 17 Sep 2009 12:11:34 +0000 (08:11 -0400)]
Merge change 25456 into eclair

* changes:
  Move flash settings from on-scren control to preference settings.

14 years agoMove flash settings from on-scren control to preference settings.
Owen Lin [Thu, 17 Sep 2009 06:45:06 +0000 (14:45 +0800)]
Move flash settings from on-scren control to preference settings.

Change-Id: Id45c7321c1e60cc7e29a7e9c601082624d93c9e8

14 years agoMerge change 25324 into eclair
Android (Google) Code Review [Thu, 17 Sep 2009 11:05:42 +0000 (07:05 -0400)]
Merge change 25324 into eclair

* changes:
  Don't change to orientation in the jpeg file. (It didn't work anyway).

14 years agoFix 2122382: We don't handle overlay destroy and re-create properly.
Chih-Chung Chang [Thu, 17 Sep 2009 10:34:47 +0000 (18:34 +0800)]
Fix 2122382: We don't handle overlay destroy and re-create properly.

Because the overlay behavior changed, the overlay will be destroyed if we hide it.
So we need to stop preview at that time. To properly handle this situation we need
to add more code and it will be slower. For now we just don't hide the overlay
because the image on top of it will obscure it anyway.

Change-Id: I5c479381a578448a712dedc1bb97ba6f36db468f

14 years agoHandle the keep-screen-on more properly.
Owen Lin [Wed, 16 Sep 2009 06:43:09 +0000 (14:43 +0800)]
Handle the keep-screen-on more properly.

Change-Id: Iec16b1975537f69230d1c8ac19a5b0ff5a75d861

14 years agoImplement the drawer UI. When user click on the drawer button, the
Owen Lin [Mon, 14 Sep 2009 11:04:37 +0000 (19:04 +0800)]
Implement the drawer UI. When user click on the drawer button, the
on-screen settings will show up.

Change-Id: I86a587969a9a01d62560e21d457d3639841ba6da

14 years agoMerge change 25454 into eclair
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.

14 years agoMerge change 24874 into eclair
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().

14 years agoFix 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

14 years agoFix a bug that if user close the settings directly from sub menu.
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.

14 years ago modified: tests/src/com/android/camera/stress/ImageCapture.java
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.

14 years agoDon't change to orientation in the jpeg file. (It didn't work anyway).
Chih-Chung Chang [Wed, 16 Sep 2009 19:14:59 +0000 (03:14 +0800)]
Don't change to orientation in the jpeg file. (It didn't work anyway).

14 years agoMerge change 25257 into eclair
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.

14 years agoUse 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

14 years agoFix http://b/2115002.
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().

14 years agoMerge change 25034 into eclair
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

14 years agoRestart preview if preview size is changed in camcorder.
Wu-cheng Li [Tue, 15 Sep 2009 10:52:25 +0000 (18:52 +0800)]
Restart preview if preview size is changed in camcorder.

14 years agoFix 2083478: Camera needs an auto-focus cancel API
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

14 years agoBetter fix for 2117211: NPE in Camera.onFlashModeChanged
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

14 years agoServeral improvement of OnScreenSettings.
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

14 years agoMerge change 24871 into eclair
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.

14 years agoMerge change 24866 into eclair
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.

14 years agoFix the bug that scene mode doesn't change immediately.
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

14 years agoAdd OnVisibilityChangedListener to OnScreenSettings. So that we can
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

14 years agoFix 2113527: NPE in ViewImage.onActivityResult.
Chih-Chung Chang [Mon, 14 Sep 2009 04:46:16 +0000 (12:46 +0800)]
Fix 2113527: NPE in ViewImage.onActivityResult.

Change-Id: I87eca374895b1896a993ed80aa204193dce17123

14 years agoMerge change 24864 into eclair
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

14 years agoFix 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

14 years agoFix 2114487: NPE in ReviewImage.onPrepareOptionsMenu
Chih-Chung Chang [Fri, 11 Sep 2009 17:30:42 +0000 (01:30 +0800)]
Fix 2114487: NPE in ReviewImage.onPrepareOptionsMenu

14 years agoRemove CameraSettings. And then renmae CameraSettingsHelper to CameraSettings
Owen Lin [Thu, 10 Sep 2009 11:08:01 +0000 (19:08 +0800)]
Remove CameraSettings. And then renmae CameraSettingsHelper to CameraSettings

Change-Id: I515c90bb5c4d49a2c4a761a933c0db6fbec0637b

14 years agoRemove switch menu item in both Camera and Camcorder.
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

14 years agoEnable the on-screen settings in Camcorder and also use different settings
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

14 years agoMerge change 24648 into eclair
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.

14 years agoAdd 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

14 years agoDo not reset zoom to 1x after snapshot.
Wu-cheng Li [Thu, 10 Sep 2009 08:27:00 +0000 (16:27 +0800)]
Do not reset zoom to 1x after snapshot.

14 years agoMerge change 24507 into eclair
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.

14 years agoAdd 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

14 years agoFix 2101273: "Gallery" Text is missing in select video to upload contextual menu
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

14 years agoRemove menu items already covered by the side buttons.
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

14 years agoMerge change 24373 into eclair
Android (Google) Code Review [Thu, 10 Sep 2009 04:27:40 +0000 (00:27 -0400)]
Merge change 24373 into eclair

* changes:
  Fix bug 2106774.

14 years agoMark non-translatable strings to translatable="false".
Wu-cheng Li [Wed, 9 Sep 2009 10:24:03 +0000 (18:24 +0800)]
Mark non-translatable strings to translatable="false".

b2054300

14 years agoFix bug 2106774.
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

14 years agoAdd scene mode preference in camera.
Owen Lin [Tue, 8 Sep 2009 09:03:07 +0000 (17:03 +0800)]
Add scene mode preference in camera.

Change-Id: I56fe3a1fc942f18faefbbc06d0fdac013c791ed6

14 years agoCherry pick two commits that implements color effect and white-balance
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

14 years agoSet optimal preview size.
Wu-cheng Li [Tue, 8 Sep 2009 07:18:39 +0000 (15:18 +0800)]
Set optimal preview size.

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:26:23 +0000 (16:26 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoClean menu creation code.
Chih-Chung Chang [Tue, 8 Sep 2009 05:32:52 +0000 (13:32 +0800)]
Clean menu creation code.

Change-Id: Ie8ed04e74beef78208946688ee2f33297de0b6d1

14 years agoReset frame rate to maximum in camera app.
Wu-cheng Li [Tue, 8 Sep 2009 04:21:52 +0000 (12:21 +0800)]
Reset frame rate to maximum in camera app.

14 years agoClean menu helper code.
Chih-Chung Chang [Mon, 7 Sep 2009 12:17:12 +0000 (20:17 +0800)]
Clean menu helper code.

Change-Id: I8c009ad9c340d7267e9d1cf43b6fc1513d44eb21

14 years agoFix 1977974: For photos without location data, don't offer to "Show on Maps"
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

14 years agoCode clean up.
Chih-Chung Chang [Fri, 4 Sep 2009 11:46:14 +0000 (19:46 +0800)]
Code clean up.

Change-Id: I8814d8482df5709b03ef105f547f4981db34919a

14 years agoFirst version of on-screen settings for Camera.
Owen Lin [Tue, 1 Sep 2009 06:51:53 +0000 (14:51 +0800)]
First version of on-screen settings for Camera.

Change-Id: I6e608b5b2d02abf3d1901160adba188399b03542

14 years agoUse SEND instenad of SEND_MULTIPLE if only one image/video
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

14 years agoChange Cancelable to method call directly.
Chih-Chung Chang [Fri, 4 Sep 2009 10:41:13 +0000 (18:41 +0800)]
Change Cancelable to method call directly.

Change-Id: Id4396646e82593d9a40b3552dd2c6cd8146b29eb

14 years agoMake the grid view thumbnails smooth by using FILTER_BITMAP_FLAG.
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

14 years agoMerge change 23873 into eclair
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.

14 years agoWhen resuming MovieView after a pause, don't autoresume, but
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.

14 years agoAdd double tap to control digital zoom.
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

14 years agoUse continous zoom.
Wu-cheng Li [Wed, 2 Sep 2009 08:53:37 +0000 (16:53 +0800)]
Use continous zoom.

14 years agoMark the untranslatable Camera arrays as translatable="false".
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.

14 years agoMerge change 23616 into eclair
Android (Google) Code Review [Wed, 2 Sep 2009 10:34:13 +0000 (03:34 -0700)]
Merge change 23616 into eclair

* changes:
  Fix bug 2078592.

14 years agoRemove trailing spaces.
Owen Lin [Wed, 2 Sep 2009 10:03:42 +0000 (18:03 +0800)]
Remove trailing spaces.

Change-Id: I80feb1b58c148b35b2666ef08d4b13d5aa0608b2

14 years agoFix bug 2078592.
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

14 years agoMerge change 23255 into eclair
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.

14 years agoUse new parameters API.
Wu-cheng Li [Wed, 2 Sep 2009 08:33:59 +0000 (16:33 +0800)]
Use new parameters API.

14 years agoRemove camcorder launcher icon and unused permissions.
Chih-Chung Chang [Wed, 2 Sep 2009 05:25:02 +0000 (13:25 +0800)]
Remove camcorder launcher icon and unused permissions.

Change-Id: Iac72ccf0147ab15ef64dc285ff4506a9a067bdee

14 years agoFix 2066449: Align aspect ratio of the UI layout for video/image capture aplication
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

14 years agoMerge change 23279 into eclair
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.

14 years agoMake 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

14 years agoMerge change 23269 into eclair
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.

14 years agoAdd zoom UI.
Wu-cheng Li [Mon, 31 Aug 2009 11:31:59 +0000 (19:31 +0800)]
Add zoom UI.

14 years agoFix 2068807: Runtime Exception in viewing DRM images downloaded by the browser.
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

14 years agoRemove unused code.
Chih-Chung Chang [Mon, 31 Aug 2009 03:14:15 +0000 (11:14 +0800)]
Remove unused code.

Change-Id: I848708a594ee58adad404ae3c67257e74cc18e58

14 years agoShow error dialog when the camera hardware is busy (Eg: hijack by other
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

14 years agoMerge change 23088 into eclair
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

14 years agoMerge change 23138 into eclair
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.

14 years agoMerge change 23025 into eclair
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.

14 years agoHigh-resolution (hdpi) artwork from TAT for Camera.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Camera.

14 years agoArmor string format tokens with translation placeholders.
Eric Fischer [Fri, 28 Aug 2009 00:23:59 +0000 (17:23 -0700)]
Armor string format tokens with translation placeholders.

Change-Id: I440a3791eaa7f371b411cfe1cfbc4021b9d02a6e