OSDN Git Service
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.
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.
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.
Owen Lin [Thu, 3 Dec 2009 04:18:57 +0000 (20:18 -0800)]
am
46400abe: am
86d784ba: Fix the bug that the on-screen menu kept the position in last time.
Merge commit '
46400abe0154cf725a7c3708c71336357aa7cebb'
* commit '
46400abe0154cf725a7c3708c71336357aa7cebb':
Fix the bug that the on-screen menu kept the position in last time.
Eric Fischer [Wed, 2 Dec 2009 23:21:17 +0000 (15:21 -0800)]
am
47452ecd: am
26ea8a10: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
47452ecdb24a4f699e8cced695e457c87491eae5' into eclair-mr2-plus-aosp
* commit '
47452ecdb24a4f699e8cced695e457c87491eae5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:11:55 +0000 (15:11 -0800)]
am
26ea8a10: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
26ea8a10e742a15f1e62f2ce8304b9d73f5fdd14' into eclair-mr2
* commit '
26ea8a10e742a15f1e62f2ce8304b9d73f5fdd14':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:09:41 +0000 (15:09 -0800)]
am
26ea8a10: Import revised translations. DO NOT MERGE
Merge commit '
26ea8a10e742a15f1e62f2ce8304b9d73f5fdd14' into eclair-plus-aosp
* commit '
26ea8a10e742a15f1e62f2ce8304b9d73f5fdd14':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:55:57 +0000 (14:55 -0800)]
Import revised translations. DO NOT MERGE
Owen Lin [Wed, 2 Dec 2009 10:37:16 +0000 (18:37 +0800)]
Add check if the media is still recording when the timeup event is comming.
Change-Id: If3ab51b5da867378182960694dab12af3cae5da1
Owen Lin [Wed, 2 Dec 2009 10:24:04 +0000 (02:24 -0800)]
am
6cc78771: Merge change Ibb62c511 into eclair-mr2
Merge commit '
6cc787719e274b2b14e45232d138654bb47d0130' into eclair-mr2-plus-aosp
* commit '
6cc787719e274b2b14e45232d138654bb47d0130':
Prevent double click for record button.
Android (Google) Code Review [Wed, 2 Dec 2009 10:20:51 +0000 (02:20 -0800)]
Merge change Ibb62c511 into eclair-mr2
* changes:
Prevent double click for record button.
Owen Lin [Tue, 1 Dec 2009 06:16:42 +0000 (14:16 +0800)]
Prevent double click for record button.
http://b/
2273733
Change-Id: Ibb62c511db77568aed5ae7899e2193b85a6b2e8c
Owen Lin [Wed, 2 Dec 2009 05:39:23 +0000 (21:39 -0800)]
am
86d784ba: Fix the bug that the on-screen menu kept the position in last time.
Merge commit '
86d784ba89f92835058148eaf31fb5d08ebe1bb0' into eclair-mr2-plus-aosp
* commit '
86d784ba89f92835058148eaf31fb5d08ebe1bb0':
Fix the bug that the on-screen menu kept the position in last time.
Owen Lin [Tue, 10 Nov 2009 09:37:21 +0000 (17:37 +0800)]
Fix the bug that the on-screen menu kept the position in last time.
http://b/issue?id=
2199588
Change-Id: Ia8b423918494dcb5e71b8b4185381a22c2ab7504
Yu Shan Emily Lau [Wed, 2 Dec 2009 01:39:57 +0000 (17:39 -0800)]
am
c889d648: am
7dfaf544: am
5e4deaf0: Merge change I94d56d71 into eclair
Merge commit '
c889d648d13c92d0413580d07ef1aeb8f0135a15'
* commit '
c889d648d13c92d0413580d07ef1aeb8f0135a15':
Split the startup measurment into two parts.
Eric Fischer [Wed, 2 Dec 2009 01:39:53 +0000 (17:39 -0800)]
am
c0046471: (-s ours) am
2927e791: am
adf9b7ff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c004647186a1145efb00193bf17c4caf1d31169e'
* commit '
c004647186a1145efb00193bf17c4caf1d31169e':
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Wed, 2 Dec 2009 01:30:09 +0000 (17:30 -0800)]
am
7dfaf544: am
5e4deaf0: Merge change I94d56d71 into eclair
Merge commit '
7dfaf5446aa8f49823dbace45ae358e2c53e865c' into eclair-mr2-plus-aosp
* commit '
7dfaf5446aa8f49823dbace45ae358e2c53e865c':
Split the startup measurment into two parts.
Eric Fischer [Wed, 2 Dec 2009 01:30:06 +0000 (17:30 -0800)]
am
2927e791: am
adf9b7ff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
2927e79158f23ce910deaf9b6fdf69282d4201cc' into eclair-mr2-plus-aosp
* commit '
2927e79158f23ce910deaf9b6fdf69282d4201cc':
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Wed, 2 Dec 2009 01:13:55 +0000 (17:13 -0800)]
am
5e4deaf0: Merge change I94d56d71 into eclair
Merge commit '
5e4deaf0aaf218d1c6ccf5f86ee7ca38bafa5c45' into eclair-mr2
* commit '
5e4deaf0aaf218d1c6ccf5f86ee7ca38bafa5c45':
Split the startup measurment into two parts.
Eric Fischer [Wed, 2 Dec 2009 01:10:37 +0000 (17:10 -0800)]
am
adf9b7ff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
adf9b7ffa9fb29c7d7426c5a8b827bd57a917acc' into eclair-mr2
* commit '
adf9b7ffa9fb29c7d7426c5a8b827bd57a917acc':
Import revised translations. DO NOT MERGE
Owen Lin [Tue, 1 Dec 2009 17:13:43 +0000 (09:13 -0800)]
am
7511b616: am
ba4a1f66: Layout the menu item of second level on-screen menu.
Merge commit '
7511b6160862d21b8f511198f25b3fb9f3bd3b3a'
* commit '
7511b6160862d21b8f511198f25b3fb9f3bd3b3a':
Layout the menu item of second level on-screen menu.
Owen Lin [Tue, 1 Dec 2009 06:25:36 +0000 (22:25 -0800)]
am
ba4a1f66: Layout the menu item of second level on-screen menu.
Merge commit '
ba4a1f660c8e7ca16dc5b2fabbf9d7466810a0d7' into eclair-mr2-plus-aosp
* commit '
ba4a1f660c8e7ca16dc5b2fabbf9d7466810a0d7':
Layout the menu item of second level on-screen menu.
Owen Lin [Wed, 11 Nov 2009 03:21:46 +0000 (11:21 +0800)]
Layout the menu item of second level on-screen menu.
http://b/issue?id=
2203704
Change-Id: I4e7f455eb037cb1cf60e85b338229c83d62a99f2
Yu Shan Emily Lau [Mon, 30 Nov 2009 20:25:27 +0000 (12:25 -0800)]
am
5e4deaf0: Merge change I94d56d71 into eclair
Merge commit '
5e4deaf0aaf218d1c6ccf5f86ee7ca38bafa5c45' into eclair-plus-aosp
* commit '
5e4deaf0aaf218d1c6ccf5f86ee7ca38bafa5c45':
Split the startup measurment into two parts.
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 20:01:09 +0000 (12:01 -0800)]
am
adf9b7ff: Import revised translations. DO NOT MERGE
Merge commit '
adf9b7ffa9fb29c7d7426c5a8b827bd57a917acc' into eclair-plus-aosp
* commit '
adf9b7ffa9fb29c7d7426c5a8b827bd57a917acc':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:35:19 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
Owen Lin [Fri, 27 Nov 2009 03:41:24 +0000 (19:41 -0800)]
am
dd6bc422: am
4ddee78a: Add one more picture size settings.
Merge commit '
dd6bc422dd745c436df2e216693531275a807e0c'
* commit '
dd6bc422dd745c436df2e216693531275a807e0c':
Add one more picture size settings.
Owen Lin [Fri, 27 Nov 2009 03:37:04 +0000 (19:37 -0800)]
am
4ddee78a: Add one more picture size settings.
Merge commit '
4ddee78a1507b3c067745023bd2330b866b8aaf9' into eclair-mr2-plus-aosp
* commit '
4ddee78a1507b3c067745023bd2330b866b8aaf9':
Add one more picture size settings.
Owen Lin [Tue, 24 Nov 2009 08:49:54 +0000 (16:49 +0800)]
Add one more picture size settings.
We need small size for the fake camera in emulator.
Change-Id: I5543936338813d575efc158c78e219da7feb9415
Petri Gynther [Thu, 26 Nov 2009 09:05:33 +0000 (01:05 -0800)]
am
b8a24707: am
30055f68: Camera: Clean up the image/video file naming code
Merge commit '
b8a2470730a4e9332661604631d74e23f0f6a001'
* commit '
b8a2470730a4e9332661604631d74e23f0f6a001':
Camera: Clean up the image/video file naming code
Petri Gynther [Thu, 26 Nov 2009 09:01:10 +0000 (01:01 -0800)]
am
30055f68: Camera: Clean up the image/video file naming code
Merge commit '
30055f6830b3d524cfbdfeab6536bb46e390747a' into eclair-mr2-plus-aosp
* commit '
30055f6830b3d524cfbdfeab6536bb46e390747a':
Camera: Clean up the image/video file naming code
Petri Gynther [Tue, 20 Oct 2009 23:51:28 +0000 (16:51 -0700)]
Camera: Clean up the image/video file naming code
1) Create 'image_file_name_format' string in strings.xml
2) Change createName() routines in Camera.java and
VideoCamera.java to use 'image_file_name_format' and
'video_file_name_format', respectively.
3) Change image filenames on SD card to format:
IMG_yyyyMMdd_HHmmss.jpg -- e.g. IMG_20091020_120000.jpg
(Old format was 'yyyy-MM-dd HH.mm.ss.jpg' which
contained undesirable space character in the filename.)
4) Similarly, change video filenames to format:
VID_yyyyMMdd_HHmmss.3gp -- e.g. VID_20091020_120000.3gp
(Old format was 'video-yyyy-MM-dd-HH-mm-ss.3gp' which
was not consistent with the image filename format.)
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)
Owen Lin [Sat, 21 Nov 2009 02:21:02 +0000 (18:21 -0800)]
am
030f38ed: am
4d0f3089: am
47dd2cf1: Fix black screen after resuming camera.
Merge commit '
030f38ed62478fa65a89f8c754973cbf8e729979'
* commit '
030f38ed62478fa65a89f8c754973cbf8e729979':
Fix black screen after resuming camera.
Owen Lin [Sat, 21 Nov 2009 02:18:57 +0000 (18:18 -0800)]
am
4d0f3089: am
47dd2cf1: Fix black screen after resuming camera.
Merge commit '
4d0f30896f412439b92f38bee204766fb5853b1a' into eclair-mr2-plus-aosp
* commit '
4d0f30896f412439b92f38bee204766fb5853b1a':
Fix black screen after resuming camera.
Owen Lin [Sat, 21 Nov 2009 02:15:51 +0000 (18:15 -0800)]
am
47dd2cf1: Fix black screen after resuming camera.
Merge commit '
47dd2cf1dacad3687410ea6e8e4f05542a5fdc46' into eclair-mr2
* commit '
47dd2cf1dacad3687410ea6e8e4f05542a5fdc46':
Fix black screen after resuming camera.
Owen Lin [Sat, 21 Nov 2009 02:15:40 +0000 (18:15 -0800)]
am
47dd2cf1: Fix black screen after resuming camera.
Merge commit '
47dd2cf1dacad3687410ea6e8e4f05542a5fdc46' into eclair-plus-aosp
* commit '
47dd2cf1dacad3687410ea6e8e4f05542a5fdc46':
Fix black screen after resuming camera.
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 [Fri, 20 Nov 2009 03:53:26 +0000 (19:53 -0800)]
am
d3be7fd4: am
471fd0aa: resolved conflicts for merge of
503560f0 to eclair-mr2
Merge commit '
d3be7fd48cb178e1bbd49711e9ec7b085cf27da4'
* commit '
d3be7fd48cb178e1bbd49711e9ec7b085cf27da4':
Keep space for those empty icons but hide them if the feature is not
Owen Lin [Fri, 20 Nov 2009 03:53:23 +0000 (19:53 -0800)]
am
4e696d9f: am
e1706c13: am
3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.
Merge commit '
4e696d9f5acc634a51d6395111955d4979416a9a'
* commit '
4e696d9f5acc634a51d6395111955d4979416a9a':
Use "Use My Location" settings to decide wheather we store the picture's location.
Owen Lin [Fri, 20 Nov 2009 03:50:01 +0000 (19:50 -0800)]
am
471fd0aa: resolved conflicts for merge of
503560f0 to eclair-mr2
Merge commit '
471fd0aa7dccebe4ac63e8202ee9227ccb52c83d' into eclair-mr2-plus-aosp
* commit '
471fd0aa7dccebe4ac63e8202ee9227ccb52c83d':
Keep space for those empty icons but hide them if the feature is not
Owen Lin [Fri, 20 Nov 2009 03:49:57 +0000 (19:49 -0800)]
am
e1706c13: am
3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.
Merge commit '
e1706c13d469a163d811e29d33b86cc5d4bf67e9' into eclair-mr2-plus-aosp
* commit '
e1706c13d469a163d811e29d33b86cc5d4bf67e9':
Use "Use My Location" settings to decide wheather we store the picture's location.
Owen Lin [Fri, 20 Nov 2009 03:24:05 +0000 (11:24 +0800)]
resolved conflicts for merge of
503560f0 to eclair-mr2
Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
Owen Lin [Fri, 20 Nov 2009 03:07:21 +0000 (19:07 -0800)]
am
503560f0: Keep space for those empty icons but hide them if the feature is not supported.
Merge commit '
503560f0dc42d6185c61be06f8060dfd50d30d69' into eclair-plus-aosp
* commit '
503560f0dc42d6185c61be06f8060dfd50d30d69':
Keep space for those empty icons but hide them if the feature is not
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
Owen Lin [Thu, 19 Nov 2009 01:54:42 +0000 (17:54 -0800)]
am
3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.
Merge commit '
3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2
* commit '
3e44f8076a16792bb295589ca4b467ba27ea2a6f':
Use "Use My Location" settings to decide wheather we store the picture's location.
Owen Lin [Thu, 19 Nov 2009 01:54:00 +0000 (17:54 -0800)]
am
3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.
Merge commit '
3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-plus-aosp
* commit '
3e44f8076a16792bb295589ca4b467ba27ea2a6f':
Use "Use My Location" settings to decide wheather we store the picture's location.
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 [Wed, 18 Nov 2009 00:40:59 +0000 (16:40 -0800)]
am
a9294c2c: am
ec1b9c50: am
df926b6e: Fix
2265947 Blank screen when invoking gallery view intent from camera b/
2265947
Merge commit '
a9294c2cee066e91a814aff82615f59c119d751f'
* commit '
a9294c2cee066e91a814aff82615f59c119d751f':
Fix
2265947 Blank screen when invoking gallery view intent from camera
Ray Chen [Wed, 18 Nov 2009 00:37:22 +0000 (16:37 -0800)]
am
ec1b9c50: am
df926b6e: Fix
2265947 Blank screen when invoking gallery view intent from camera b/
2265947
Merge commit '
ec1b9c508c4d04d68131579c4716ff32a3e29740' into eclair-mr2-plus-aosp
* commit '
ec1b9c508c4d04d68131579c4716ff32a3e29740':
Fix
2265947 Blank screen when invoking gallery view intent from camera
Ray Chen [Wed, 18 Nov 2009 00:34:33 +0000 (16:34 -0800)]
am
df926b6e: Fix
2265947 Blank screen when invoking gallery view intent from camera b/
2265947
Merge commit '
df926b6e115e0f7fb4342abf0702258b8c285b7c' into eclair-mr2
* commit '
df926b6e115e0f7fb4342abf0702258b8c285b7c':
Fix
2265947 Blank screen when invoking gallery view intent from camera
Ray Chen [Wed, 18 Nov 2009 00:18:51 +0000 (16:18 -0800)]
am
df926b6e: Fix
2265947 Blank screen when invoking gallery view intent from camera b/
2265947
Merge commit '
df926b6e115e0f7fb4342abf0702258b8c285b7c' into eclair-plus-aosp
* commit '
df926b6e115e0f7fb4342abf0702258b8c285b7c':
Fix
2265947 Blank screen when invoking gallery view intent from camera
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
Ray Chen [Tue, 17 Nov 2009 23:06:14 +0000 (15:06 -0800)]
am
cfd81045: am
538e2e2a: am
92acbf6c: Merge change Ie07be885 into eclair
Merge commit '
cfd81045ff90aa26e70d4bcd329670e599b59d9c'
* commit '
cfd81045ff90aa26e70d4bcd329670e599b59d9c':
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
Yu Shan Emily Lau [Tue, 17 Nov 2009 23:05:27 +0000 (15:05 -0800)]
am
9f00c1b7: am
0a76e594: am
56e1db46: Trun on the log to see what causing the failure
Merge commit '
9f00c1b7be96bb5f11ed95c75c4ce3cb8a6ca005'
* commit '
9f00c1b7be96bb5f11ed95c75c4ce3cb8a6ca005':
Trun on the log to see what causing the failure
Yu Shan Emily Lau [Tue, 17 Nov 2009 23:05:23 +0000 (15:05 -0800)]
am
e25de22b: am
e517ec71: am
154d112a: Increse the wait time for image capture.
Merge commit '
e25de22bcc7882924f74e5aeaae17eb70b5faa83'
* commit '
e25de22bcc7882924f74e5aeaae17eb70b5faa83':
Increse the wait time for image capture.
Owen Lin [Tue, 17 Nov 2009 15:31:35 +0000 (07:31 -0800)]
am
8cc1fd1b: am
ea7c3e6a: resolved conflicts for merge of
4d55cb36 to eclair-mr2
Merge commit '
8cc1fd1b44f6864c4730da001ea34c597b55ec92'
* commit '
8cc1fd1b44f6864c4730da001ea34c597b55ec92':
Hide the indicator if the icon is empty.
Ray Chen [Tue, 17 Nov 2009 07:36:36 +0000 (23:36 -0800)]
am
538e2e2a: am
92acbf6c: Merge change Ie07be885 into eclair
Merge commit '
538e2e2a3923bb614db10bd8586781b6a5c8ec0c' into eclair-mr2-plus-aosp
* commit '
538e2e2a3923bb614db10bd8586781b6a5c8ec0c':
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
Ray Chen [Tue, 17 Nov 2009 07:34:19 +0000 (23:34 -0800)]
am
92acbf6c: Merge change Ie07be885 into eclair
Merge commit '
92acbf6c5a5c654bfdaa871afc891a8723acebf8' into eclair-mr2
* commit '
92acbf6c5a5c654bfdaa871afc891a8723acebf8':
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
Ray Chen [Tue, 17 Nov 2009 07:34:18 +0000 (23:34 -0800)]
am
92acbf6c: Merge change Ie07be885 into eclair
Merge commit '
92acbf6c5a5c654bfdaa871afc891a8723acebf8' into eclair-plus-aosp
* commit '
92acbf6c5a5c654bfdaa871afc891a8723acebf8':
Fix issue
2259506 and
2262817 by keeping a reference to MediaProvider when camera is active.
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.