OSDN Git Service
Chih-Chung Chang [Fri, 5 Mar 2010 23:34:47 +0000 (15:34 -0800)]
Remove unused code.
Chih-Chung Chang [Fri, 5 Mar 2010 06:15:45 +0000 (22:15 -0800)]
Remove unused code.
This is for unbundling, will clean more later.
Owen Lin [Fri, 5 Mar 2010 02:53:38 +0000 (18:53 -0800)]
Merge "Add strings for for new UI."
Owen Lin [Thu, 4 Mar 2010 06:45:33 +0000 (14:45 +0800)]
Add strings for for new UI.
Change-Id: I0b398d87f3526a70c45a607efbd7823185e53d64
Ray Chen [Fri, 5 Mar 2010 01:20:59 +0000 (17:20 -0800)]
Merge "Add location provider name to gps-processing-method parameter."
Eric Fischer [Thu, 4 Mar 2010 22:04:25 +0000 (14:04 -0800)]
Import new translations
Ray Chen [Thu, 25 Feb 2010 03:32:12 +0000 (11:32 +0800)]
Add location provider name to gps-processing-method parameter.
James Dong [Thu, 4 Mar 2010 01:39:26 +0000 (17:39 -0800)]
Merge "Use unhidden public API from MediaRecorder.java class for setting parameters This change depends on the MediaRecorder.java class change: 42513"
James Dong [Tue, 2 Mar 2010 02:38:44 +0000 (18:38 -0800)]
Use unhidden public API from MediaRecorder.java class for setting parameters
This change depends on the MediaRecorder.java class change: 42513
bug -
2362412
Ying Wang [Wed, 3 Mar 2010 22:58:34 +0000 (14:58 -0800)]
Enable proguard on Camera.
also fix proguard flags.
Horia Ciurdar [Wed, 3 Mar 2010 16:40:26 +0000 (08:40 -0800)]
Merge "Don't start recording right away, even when in quickCapture mode."
Wu-cheng Li [Tue, 2 Mar 2010 23:11:52 +0000 (15:11 -0800)]
Disable proguard to avoid camera crash.
We should check what classes/members we want to keep. Before that, let's disable
it to keep camera working.
Horia Ciurdar [Tue, 2 Mar 2010 18:59:32 +0000 (18:59 +0000)]
Don't start recording right away, even when in quickCapture mode.
Owen Lin [Tue, 2 Mar 2010 04:53:08 +0000 (20:53 -0800)]
Merge "The first runnable version of the new UI."
Eric Fischer [Sat, 27 Feb 2010 01:28:10 +0000 (17:28 -0800)]
Import new translations.
Owen Lin [Fri, 29 Jan 2010 00:10:19 +0000 (16:10 -0800)]
The first runnable version of the new UI.
Implement the new UI with OpenGL (GLSurfaceView).
Known issues:
* Texture are never freed from GL
* Do not consider the density of screen. Currently, the dimensions in mdpi
devices are wrong.
* It won't work on Sapphire, bug fired: Bug:
2473605
* The action UP event may pass a wrong target. (It should pass to the same
target who recive the DOWN action.
* Animation is not smooth enough.
* Should not allocate objects into heap during rendering path.
* The scrollbar in GLListView doesn't match the design
* We should calculate our own orientation instead of using the system one.
* Regression: "restore to default settings" is removed
Change-Id: I93fa45831aa87787dd5ee9e43e270a9d786c5a2a
James Dong [Wed, 24 Feb 2010 02:05:39 +0000 (18:05 -0800)]
Set duration and still image encoding quality using Java API
- rebased
bug -
2375978
Owen Lin [Thu, 25 Feb 2010 05:30:05 +0000 (21:30 -0800)]
Merge "Fix the no "SD Card is full" bug. Now, we show the error message when we find out the storage may be not enough for next picture."
Owen Lin [Wed, 3 Feb 2010 23:09:38 +0000 (15:09 -0800)]
Fix the no "SD Card is full" bug. Now, we show the error message when we find
out the storage may be not enough for next picture.
Bug:
2377057
Change-Id: Ie6684738a282c382cf6368276dd78f77ca848611
Wei-Ta Chen [Wed, 24 Feb 2010 03:34:22 +0000 (11:34 +0800)]
Enable enter and exit animations; and use overridePendingTransition
for disabling animations in switching VideoCamera and Camera.
Bug:
2416396
Chih-Chung Chang [Tue, 23 Feb 2010 17:12:11 +0000 (09:12 -0800)]
Merge "Remove unused resources."
Chih-Chung Chang [Mon, 22 Feb 2010 17:44:47 +0000 (09:44 -0800)]
Remove unused resources.
Chih-Chung Chang [Mon, 22 Feb 2010 17:09:56 +0000 (09:09 -0800)]
Merge "Move set screen brightness later so we can start preview earlier."
Chih-Chung Chang [Sat, 20 Feb 2010 01:59:40 +0000 (17:59 -0800)]
Remove unused strings.
Chih-Chung Chang [Fri, 19 Feb 2010 20:35:58 +0000 (12:35 -0800)]
Move set screen brightness later so we can start preview earlier.
Chih-Chung Chang [Thu, 11 Feb 2010 22:05:50 +0000 (14:05 -0800)]
Remove the use of native allocation.
Chih-Chung Chang [Thu, 11 Feb 2010 22:22:47 +0000 (14:22 -0800)]
Remove support for DRM images (they are not used now and reference to hidden classes).
Jeff Hamilton [Thu, 11 Feb 2010 22:25:48 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.
Change-Id: I4695e860b57b45010a201577bd611636717350e9
Ray Chen [Mon, 8 Feb 2010 07:04:41 +0000 (15:04 +0800)]
Revise due to ThumbnailUtils api change.
Bjorn Bringert [Wed, 10 Feb 2010 11:37:28 +0000 (03:37 -0800)]
Merge "Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES"
James Dong [Mon, 8 Feb 2010 02:42:26 +0000 (18:42 -0800)]
Replace calls to system_property with CamcorderProfile API
- rebased
bug -
2417312
Eugene Koh [Tue, 9 Feb 2010 20:21:54 +0000 (12:21 -0800)]
Merge "Update the mdpi resource with v2.0 icons"
Bjorn Bringert [Mon, 8 Feb 2010 21:38:38 +0000 (21:38 +0000)]
Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES
This Google-specific setting is going away because of unbundling.
This change will cause geotagging to be off by default, instead of
being set by SetupWizard by the "Use location for Google services"
prompt. If this is not desirable, another prompt could possibly be
added to SetupWizard, or a new framework geotagging setting
could be added and SetupWizard be modified to set that as part
of the Google location opt-in.
Part of: http://b/issue?id=
2383870
Change-Id: Ic160c2260dd597a35d79fec93250a816fbee8b81
Wu-cheng Li [Mon, 8 Feb 2010 12:05:28 +0000 (20:05 +0800)]
Remove some log messages.
Ray Chen [Fri, 5 Feb 2010 02:53:40 +0000 (10:53 +0800)]
Fix issue
2340332 Inconsistent UI between review mode in Camera app and album view in Gallery app
http://b/
2340332
Bai Tao [Mon, 8 Feb 2010 06:34:55 +0000 (14:34 +0800)]
Update the mdpi resource with v2.0 icons
The Android Open Source Project [Fri, 5 Feb 2010 22:25:53 +0000 (14:25 -0800)]
am
78492fe7: am
338259f2: reconcile main tree with open-source eclair
Merge commit '
78492fe70c43432a0f1c2d88bc9133d2708f51fc'
* commit '
78492fe70c43432a0f1c2d88bc9133d2708f51fc':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:49:48 +0000 (08:49 -0800)]
am
338259f2: reconcile main tree with open-source eclair
Merge commit '
338259f2740ec47ceb26ffa9d89341d1106e61b0' into eclair-plus-aosp
* commit '
338259f2740ec47ceb26ffa9d89341d1106e61b0':
android-2.1_r1 snapshot
Fix issue
2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Owen Lin [Thu, 4 Feb 2010 00:31:38 +0000 (16:31 -0800)]
Fix the switcher could be in wrong place some time.
Change-Id: I504978763da3da797f71ca9fd00116d8b27729ee
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Ray Chen [Thu, 28 Jan 2010 16:50:29 +0000 (08:50 -0800)]
Unbundle Camera: Unhide ThumbnailUtil and rename it to ThumbnailUtils.
Yu Shan Emily Lau [Thu, 28 Jan 2010 22:46:47 +0000 (14:46 -0800)]
am
3cd9af7e: am
499e3b0a: Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Merge commit '
3cd9af7e1a83b15994537e54f45f8453ae5eaa9a'
* commit '
3cd9af7e1a83b15994537e54f45f8453ae5eaa9a':
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Chih-Chung Chang [Tue, 26 Jan 2010 23:37:13 +0000 (15:37 -0800)]
Merge "Use public api instead of protected members."
Owen Lin [Tue, 26 Jan 2010 22:16:18 +0000 (14:16 -0800)]
Fix a bug that RotateImage didn't draw the thumbnail in the center.
Change-Id: Ia46c5ecbceebd5062c76b9396f39a17ae6bc1ed2
Chih-Chung Chang [Tue, 26 Jan 2010 21:40:21 +0000 (13:40 -0800)]
Use public api instead of protected members.
Owen Lin [Tue, 26 Jan 2010 01:09:52 +0000 (17:09 -0800)]
Fix a minor issue of "restore default" should also improve
performance as well.
Change-Id: I1a762ed78dc27bb711b652431481925c9bd1b8b5
Yu Shan Emily Lau [Tue, 26 Jan 2010 02:16:52 +0000 (18:16 -0800)]
am
499e3b0a: Modify the camera lantency report tag so that it is easier to publish to the dashboard.
Merge commit '
499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0' into eclair-plus-aosp
* commit '
499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0':
Modify the camera lantency report tag so that it is easier to publish to the dashboard.
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.
Owen Lin [Sat, 23 Jan 2010 00:52:31 +0000 (16:52 -0800)]
Add quick capture settings for Camera application.
Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b
Bug:
2259528
Owen Lin [Tue, 19 Jan 2010 22:37:36 +0000 (06:37 +0800)]
Unbundle with the PreferenceManager.
Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6
Wu-cheng Li [Fri, 22 Jan 2010 09:54:17 +0000 (17:54 +0800)]
Fix the bug focus bracket may appear in infinite focus mode.
bug:
2247217
Owen Lin [Fri, 15 Jan 2010 21:24:14 +0000 (05:24 +0800)]
Add restore default settings for Camera/Camcorder app.
Bug:
2167010
Change-Id: I1b59ddd23ee9a3b9cc34f911c048e269fb872cf8
Horia Ciurdar [Thu, 21 Jan 2010 12:10:14 +0000 (12:10 +0000)]
Adding hidden quickCapture extra.
Owen Lin [Fri, 25 Dec 2009 04:50:27 +0000 (12:50 +0800)]
Set the brightness to a fixed value.
Bug:
2318682
Change-Id: I367fde55fab1102019accd69e69dc516c583c153
The Android Open Source Project [Tue, 12 Jan 2010 23:19:09 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Romain Guy [Fri, 8 Jan 2010 23:06:47 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Eric Fischer [Thu, 7 Jan 2010 23:56:56 +0000 (15:56 -0800)]
Update with latest translations.
Chih-Chung Chang [Wed, 6 Jan 2010 22:06:05 +0000 (14:06 -0800)]
am
e677eb26: am
2a8efc19: Use public api instead of hidden member. Don\'t use internal resource.
Merge commit '
e677eb26a6ad63e492837dbb0af1945546095d68'
* commit '
e677eb26a6ad63e492837dbb0af1945546095d68':
Use public api instead of hidden member. Don't use internal resource.
Chih-Chung Chang [Wed, 6 Jan 2010 21:46:21 +0000 (13:46 -0800)]
am
2a8efc19: Use public api instead of hidden member. Don\'t use internal resource.
Merge commit '
2a8efc192e4c8dd6fff475494591b05b92920f22' into eclair-mr2-plus-aosp
* commit '
2a8efc192e4c8dd6fff475494591b05b92920f22':
Use public api instead of hidden member. Don't use internal resource.
Chih-Chung Chang [Tue, 5 Jan 2010 11:07:13 +0000 (19:07 +0800)]
Use public api instead of hidden member. Don't use internal resource.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:22 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: I80b28db6aaf6af365f12681caa8905e896c2c30d
Ray Chen [Tue, 5 Jan 2010 23:41:47 +0000 (15:41 -0800)]
am
7240c764: am
2e862df9: Fix issue
2343916 Camera application does not obey date format setting.
Merge commit '
7240c7643291c5ad1f069e03bac0e730e8ff430f'
* commit '
7240c7643291c5ad1f069e03bac0e730e8ff430f':
Fix issue
2343916 Camera application does not obey date format setting.
Ray Chen [Tue, 5 Jan 2010 23:29:39 +0000 (15:29 -0800)]
am
2e862df9: Fix issue
2343916 Camera application does not obey date format setting.
Merge commit '
2e862df90cac949a91634da5dce4b54d7c20d505' into eclair-mr2-plus-aosp
* commit '
2e862df90cac949a91634da5dce4b54d7c20d505':
Fix issue
2343916 Camera application does not obey date format setting.
Ray Chen [Mon, 4 Jan 2010 22:44:51 +0000 (14:44 -0800)]
Fix issue
2343916 Camera application does not obey date format setting.
http://b/
2343916
Chih-Chung Chang [Tue, 5 Jan 2010 10:31:39 +0000 (02:31 -0800)]
am
e495d5d8: am
6d08c5d4: Remove "display name" and always use "title" field in display (same as Gallery).
Merge commit '
e495d5d8d2f00f1b4e9337b925de4dfb807f1e0c'
* commit '
e495d5d8d2f00f1b4e9337b925de4dfb807f1e0c':
Remove "display name" and always use "title" field in display (same as Gallery).
Chih-Chung Chang [Tue, 5 Jan 2010 10:21:15 +0000 (02:21 -0800)]
am
6d08c5d4: Remove "display name" and always use "title" field in display (same as Gallery).
Merge commit '
6d08c5d4cb3925a11a1adbfdb0e463ca6f5dca5a' into eclair-mr2-plus-aosp
* commit '
6d08c5d4cb3925a11a1adbfdb0e463ca6f5dca5a':
Remove "display name" and always use "title" field in display (same as Gallery).
Chih-Chung Chang [Tue, 5 Jan 2010 06:34:36 +0000 (14:34 +0800)]
Remove "display name" and always use "title" field in display (same as Gallery).
Wu-cheng Li [Wed, 16 Dec 2009 17:00:05 +0000 (09:00 -0800)]
am
355912d6: am
6dfb0374: Do not set WB or effect if driver does not support it.
Merge commit '
355912d65bd6536bcef05dea2081fb6c1ce29e45'
* commit '
355912d65bd6536bcef05dea2081fb6c1ce29e45':
Do not set WB or effect if driver does not support it.
Wu-cheng Li [Wed, 16 Dec 2009 04:00:17 +0000 (20:00 -0800)]
am
6dfb0374: Do not set WB or effect if driver does not support it.
Merge commit '
6dfb03741e9ed0821fbd7fa6912f44bf76bebca6' into eclair-mr2-plus-aosp
* commit '
6dfb03741e9ed0821fbd7fa6912f44bf76bebca6':
Do not set WB or effect if driver does not support it.
Android Git Automerger [Tue, 15 Dec 2009 08:44:54 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Wu-cheng Li [Tue, 15 Dec 2009 04:29:25 +0000 (12:29 +0800)]
Do not set WB or effect if driver does not support it.
The app should always check if camera driver support the parameter
before setting it. Otherwise, the app will always crash if parameter
string changes.
b/
2323831
Wu-cheng Li [Mon, 14 Dec 2009 06:56:16 +0000 (22:56 -0800)]
am
1cbafff7: am
59595d1c: Avoid initializeRecorder during onPause.
Merge commit '
1cbafff7a353011b8e350509256b6ee80b7288a8'
* commit '
1cbafff7a353011b8e350509256b6ee80b7288a8':
Avoid initializeRecorder during onPause.
Wu-cheng Li [Mon, 14 Dec 2009 06:52:09 +0000 (22:52 -0800)]
am
59595d1c: Avoid initializeRecorder during onPause.
Merge commit '
59595d1cad16653e73bfdf811386b037f8925569' into eclair-mr2-plus-aosp
* commit '
59595d1cad16653e73bfdf811386b037f8925569':
Avoid initializeRecorder during onPause.
Wu-cheng Li [Fri, 11 Dec 2009 12:00:15 +0000 (20:00 +0800)]
Avoid initializeRecorder during onPause.
When on-screen setting is visible and home key is pressed,
onPause will set mSetting to invisible and initializeRecorder()
will be called in onVisibilityChanged(). That will cause exception
if surface holder is still null.
bug
2319111
Wu-cheng Li [Fri, 11 Dec 2009 09:40:33 +0000 (01:40 -0800)]
am
ff42ae0e: am
b65537df: Merge change Ida3e9964 into eclair-mr2
Merge commit '
ff42ae0e23bb04e316d46571d797af43cf8f4d7d'
* commit '
ff42ae0e23bb04e316d46571d797af43cf8f4d7d':
Add flash light setting in video camera.
Eric Fischer [Fri, 11 Dec 2009 07:41:40 +0000 (23:41 -0800)]
am
db4ab67a: (-s ours) am
0556720c: am
ca46c05b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
db4ab67a97ba7495de3a6a625432ab16ad5dc309'
* commit '
db4ab67a97ba7495de3a6a625432ab16ad5dc309':
Import revised translations. DO NOT MERGE
Wu-cheng Li [Fri, 11 Dec 2009 04:43:56 +0000 (20:43 -0800)]
am
b65537df: Merge change Ida3e9964 into eclair-mr2
Merge commit '
b65537df206fd69317109ab8147440b0ba9f9c25' into eclair-mr2-plus-aosp
* commit '
b65537df206fd69317109ab8147440b0ba9f9c25':
Add flash light setting in video camera.
Android (Google) Code Review [Fri, 11 Dec 2009 04:41:16 +0000 (20:41 -0800)]
Merge change Ida3e9964 into eclair-mr2
* changes:
Add flash light setting in video camera.
Eric Fischer [Fri, 11 Dec 2009 01:53:42 +0000 (17:53 -0800)]
am
0556720c: am
ca46c05b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0556720cbf19442a9a64d6296f2b69e8afc0d6fc' into eclair-mr2-plus-aosp
* commit '
0556720cbf19442a9a64d6296f2b69e8afc0d6fc':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:43:14 +0000 (17:43 -0800)]
am
ca46c05b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ca46c05b2dd8a0081d0a8b384f4fe3bcd215c9db' into eclair-mr2
* commit '
ca46c05b2dd8a0081d0a8b384f4fe3bcd215c9db':
Import revised translations. DO NOT MERGE
Wu-cheng Li [Thu, 10 Dec 2009 22:39:23 +0000 (14:39 -0800)]
am
59158f2b: am
f4823480: Do not set orientation indicator while handling image capture intent.
Merge commit '
59158f2b82dca184620e50960137ac9ef0809a12'
* commit '
59158f2b82dca184620e50960137ac9ef0809a12':
Do not set orientation indicator while handling image capture intent.
Wu-cheng Li [Thu, 10 Dec 2009 22:37:34 +0000 (14:37 -0800)]
am
40c8378a: am
69d05c5c: Fix the bug that -1 may be passed to setRotation.
Merge commit '
40c8378a4277eea815f878cb6fd1e31e73f7b871'
* commit '
40c8378a4277eea815f878cb6fd1e31e73f7b871':
Fix the bug that -1 may be passed to setRotation.
The Android Automerger [Thu, 10 Dec 2009 17:01:48 +0000 (09:01 -0800)]
Merge branch 'eclair' into eclair-release
Wu-cheng Li [Thu, 10 Dec 2009 04:13:06 +0000 (20:13 -0800)]
am
f4823480: Do not set orientation indicator while handling image capture intent.
Merge commit '
f4823480fdda6e6a4ec7deb28199a7c9631016e5' into eclair-mr2-plus-aosp
* commit '
f4823480fdda6e6a4ec7deb28199a7c9631016e5':
Do not set orientation indicator while handling image capture intent.
Eric Fischer [Thu, 10 Dec 2009 02:07:09 +0000 (18:07 -0800)]
am
ca46c05b: Import revised translations. DO NOT MERGE
Merge commit '
ca46c05b2dd8a0081d0a8b384f4fe3bcd215c9db' into eclair-plus-aosp
* commit '
ca46c05b2dd8a0081d0a8b384f4fe3bcd215c9db':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:25:08 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Wu-cheng Li [Wed, 9 Dec 2009 23:58:24 +0000 (15:58 -0800)]
am
69d05c5c: Fix the bug that -1 may be passed to setRotation.
Merge commit '
69d05c5c970a83ef5f429130ad378dd00f72c30c' into eclair-mr2-plus-aosp
* commit '
69d05c5c970a83ef5f429130ad378dd00f72c30c':
Fix the bug that -1 may be passed to setRotation.
Wu-cheng Li [Wed, 9 Dec 2009 08:14:37 +0000 (16:14 +0800)]
Do not set orientation indicator while handling image capture intent.
Wu-cheng Li [Wed, 9 Dec 2009 06:02:47 +0000 (14:02 +0800)]
Fix the bug that -1 may be passed to setRotation.
Wu-cheng Li [Tue, 8 Dec 2009 04:47:21 +0000 (12:47 +0800)]
Add flash light setting in video camera.
http://b/
2118298
Owen Lin [Fri, 4 Dec 2009 12:33:21 +0000 (04:33 -0800)]
am
0588c8b1: am
ff58fb69: Use icon to indicate the orientation of the taken photos.
Merge commit '
0588c8b15c304477c31978016d536abb291e5274'
* commit '
0588c8b15c304477c31978016d536abb291e5274':
Use icon to indicate the orientation of the taken photos.
Owen Lin [Fri, 4 Dec 2009 11:03:33 +0000 (03:03 -0800)]
am
ff58fb69: Use icon to indicate the orientation of the taken photos.
Merge commit '
ff58fb6921ccb7398ad30c8cec604c38c76be4fc' into eclair-mr2-plus-aosp
* commit '
ff58fb6921ccb7398ad30c8cec604c38c76be4fc':
Use icon to indicate the orientation of the taken photos.
Owen Lin [Fri, 4 Dec 2009 03:48:21 +0000 (11:48 +0800)]
Use icon to indicate the orientation of the taken photos.
Change-Id: I144e2dd590e98942763fc6e243da3e17cb25d88d
Owen Lin [Thu, 3 Dec 2009 18:52:49 +0000 (10:52 -0800)]
am
34aabe7c: am
ad9df588: Merge change If3ab51b5 into eclair-mr2
Merge commit '
34aabe7ca84eb5ddd7edcb1b5d37e6de79928511'
* commit '
34aabe7ca84eb5ddd7edcb1b5d37e6de79928511':
Add check if the media is still recording when the timeup event is comming.
The Android Automerger [Thu, 3 Dec 2009 17:00:02 +0000 (09:00 -0800)]
Merge branch 'eclair' into eclair-release
Owen Lin [Thu, 3 Dec 2009 07:27:44 +0000 (23:27 -0800)]
am
ad9df588: Merge change If3ab51b5 into eclair-mr2
Merge commit '
ad9df588053caf70976de9dd29b612fdf698ee4d' into eclair-mr2-plus-aosp
* commit '
ad9df588053caf70976de9dd29b612fdf698ee4d':
Add check if the media is still recording when the timeup event is comming.
Android (Google) Code Review [Thu, 3 Dec 2009 07:23:41 +0000 (23:23 -0800)]
Merge change If3ab51b5 into eclair-mr2
* changes:
Add check if the media is still recording when the timeup event is comming.
Eric Fischer [Thu, 3 Dec 2009 04:40:47 +0000 (20:40 -0800)]
am
cab8ffa5: (-s ours) am
47452ecd: am
26ea8a10: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
cab8ffa5e5f447b55fbec50418034cb4c458ba45'
* commit '
cab8ffa5e5f447b55fbec50418034cb4c458ba45':
Import revised translations. DO NOT MERGE
Owen Lin [Thu, 3 Dec 2009 04:19:01 +0000 (20:19 -0800)]
am
9293e8dd: am
6cc78771: Merge change Ibb62c511 into eclair-mr2
Merge commit '
9293e8dd5cc777b10dcd532e42fab85831a47602'
* commit '
9293e8dd5cc777b10dcd532e42fab85831a47602':
Prevent double click for record button.