OSDN Git Service
Marco Nelissen [Thu, 12 Nov 2009 01:33:40 +0000 (17:33 -0800)]
am
423d67e3: am
1c15149f: am
e99341f9: Add some logging to help track down bug
2223013.
Merge commit '
423d67e33a54aeeed4af8ac13fafc8b3e58a7515'
* commit '
423d67e33a54aeeed4af8ac13fafc8b3e58a7515':
Add some logging to help track down bug
2223013.
Marco Nelissen [Thu, 12 Nov 2009 01:25:01 +0000 (17:25 -0800)]
am
1c15149f: am
e99341f9: Add some logging to help track down bug
2223013.
Merge commit '
1c15149f64a446fd3d387e0134342576f46a48d3' into eclair-mr2-plus-aosp
* commit '
1c15149f64a446fd3d387e0134342576f46a48d3':
Add some logging to help track down bug
2223013.
Marco Nelissen [Thu, 12 Nov 2009 01:13:05 +0000 (17:13 -0800)]
am
e99341f9: Add some logging to help track down bug
2223013.
Merge commit '
e99341f9674462607f3fd5e8dbd100b34b973e1b' into eclair-mr2
* commit '
e99341f9674462607f3fd5e8dbd100b34b973e1b':
Add some logging to help track down bug
2223013.
Marco Nelissen [Wed, 11 Nov 2009 19:13:51 +0000 (11:13 -0800)]
Add some logging to help track down bug
2223013.
Eric Fischer [Sat, 7 Nov 2009 00:27:18 +0000 (16:27 -0800)]
am
49bf82fc: (-s ours) am
ade24eb4: Import revised translations. DO NOT MERGE
Merge commit '
49bf82fc21ad6e6d6760a2b28901f627de64749a'
* commit '
49bf82fc21ad6e6d6760a2b28901f627de64749a':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:15:43 +0000 (16:15 -0800)]
am
ade24eb4: Import revised translations. DO NOT MERGE
Merge commit '
ade24eb499884053c47e1727718a030850705152' into eclair-mr2-plus-aosp
* commit '
ade24eb499884053c47e1727718a030850705152':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:29:16 +0000 (15:29 -0800)]
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Thu, 29 Oct 2009 08:55:32 +0000 (01:55 -0700)]
am
a7e5f81a: am
7231c25d: am
197d7431: Merge change I71a020a9 into eclair
Merge commit '
a7e5f81a867d446b1cd29fa8fe843cf490c29ee8'
* commit '
a7e5f81a867d446b1cd29fa8fe843cf490c29ee8':
Fixed the flakiness of the music power test.
Mike Cleron [Thu, 29 Oct 2009 08:55:27 +0000 (01:55 -0700)]
am
f49ba946: am
7a1a5efe: am
fac9e042: Oops -- missed this in my last CL
Merge commit '
f49ba946eeac102f6def5fdab88651a8ffc9296b'
* commit '
f49ba946eeac102f6def5fdab88651a8ffc9296b':
Oops -- missed this in my last CL
Mike Cleron [Thu, 29 Oct 2009 08:55:22 +0000 (01:55 -0700)]
Yu Shan Emily Lau [Thu, 29 Oct 2009 08:42:35 +0000 (01:42 -0700)]
am
7231c25d: am
197d7431: Merge change I71a020a9 into eclair
Merge commit '
7231c25d35c2755221728e3bb9afdfcbd2c67b50' into eclair-mr2-plus-aosp
* commit '
7231c25d35c2755221728e3bb9afdfcbd2c67b50':
Fixed the flakiness of the music power test.
Mike Cleron [Thu, 29 Oct 2009 08:42:29 +0000 (01:42 -0700)]
am
7a1a5efe: am
fac9e042: Oops -- missed this in my last CL
Merge commit '
7a1a5efe405c74c619ebba3c8925ca10c568ab28' into eclair-mr2-plus-aosp
* commit '
7a1a5efe405c74c619ebba3c8925ca10c568ab28':
Oops -- missed this in my last CL
Mike Cleron [Thu, 29 Oct 2009 08:42:24 +0000 (01:42 -0700)]
Yu Shan Emily Lau [Thu, 29 Oct 2009 08:21:52 +0000 (01:21 -0700)]
am
197d7431: Merge change I71a020a9 into eclair
Merge commit '
197d74317c3c44ed1f5ed7f40d769aec93c288f2' into eclair-mr2
* commit '
197d74317c3c44ed1f5ed7f40d769aec93c288f2':
Fixed the flakiness of the music power test.
Mike Cleron [Thu, 29 Oct 2009 08:21:23 +0000 (01:21 -0700)]
am
fac9e042: Oops -- missed this in my last CL
Merge commit '
fac9e0428fc56aa7e71eda6cdc87a3e4e74fe98e' into eclair-mr2
* commit '
fac9e0428fc56aa7e71eda6cdc87a3e4e74fe98e':
Oops -- missed this in my last CL
Mike Cleron [Thu, 29 Oct 2009 08:20:54 +0000 (01:20 -0700)]
Android (Google) Code Review [Tue, 27 Oct 2009 20:49:03 +0000 (16:49 -0400)]
Merge change I71a020a9 into eclair
* changes:
Fixed the flakiness of the music power test.
Mike Cleron [Tue, 27 Oct 2009 20:39:43 +0000 (13:39 -0700)]
Oops -- missed this in my last CL
Mike Cleron [Tue, 27 Oct 2009 06:29:38 +0000 (23:29 -0700)]
New widgets
Yu Shan Emily Lau [Tue, 27 Oct 2009 04:55:38 +0000 (21:55 -0700)]
Fixed the flakiness of the music power test.
Eric Fischer [Thu, 22 Oct 2009 16:46:34 +0000 (09:46 -0700)]
am
43709daf: (-s ours) am
eb7e8dbd: am
f6c42a62: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
43709daffa122fab57452b9fc8bbfa5b9a90709b'
* commit '
43709daffa122fab57452b9fc8bbfa5b9a90709b':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:34:19 +0000 (09:34 -0700)]
am
eb7e8dbd: am
f6c42a62: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
eb7e8dbdcddc925f5a8183e6ac0e06c3e2562ebf' into eclair-mr2-plus-aosp
* commit '
eb7e8dbdcddc925f5a8183e6ac0e06c3e2562ebf':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:47:05 +0000 (06:47 -0700)]
am
f6c42a62: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f6c42a6201a88ecc03f628fa3cef844c461a3f9a' into eclair-mr2
* commit '
f6c42a6201a88ecc03f628fa3cef844c461a3f9a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:46:53 +0000 (10:46 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Marco Nelissen [Tue, 20 Oct 2009 01:17:21 +0000 (18:17 -0700)]
am
bd97aee9: am
64de08b1: resolved conflicts for merge of
0657c9ef to eclair-mr2
Merge commit '
bd97aee905f11fd845b192c3e41919a47b99afff'
* commit '
bd97aee905f11fd845b192c3e41919a47b99afff':
Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone.
Marco Nelissen [Tue, 20 Oct 2009 01:12:35 +0000 (18:12 -0700)]
am
64de08b1: resolved conflicts for merge of
0657c9ef to eclair-mr2
Merge commit '
64de08b138b2ba6aae61a1a4c240ffb181103d73' into eclair-mr2-plus-aosp
* commit '
64de08b138b2ba6aae61a1a4c240ffb181103d73':
Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone.
Marco Nelissen [Tue, 20 Oct 2009 01:04:24 +0000 (18:04 -0700)]
resolved conflicts for merge of
0657c9ef to eclair-mr2
Marco Nelissen [Tue, 20 Oct 2009 00:22:10 +0000 (17:22 -0700)]
Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:19:06 +0000 (16:19 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:17 +0000 (16:02 -0700)]
merge from open-source master
Marco Nelissen [Wed, 14 Oct 2009 16:11:37 +0000 (09:11 -0700)]
Android (Google) Code Review [Wed, 14 Oct 2009 15:54:26 +0000 (11:54 -0400)]
Merge change If7b53aba into eclair-mr2
* changes:
Fix monkey bug
2180463.
Eric Fischer [Wed, 14 Oct 2009 00:17:50 +0000 (17:17 -0700)]
am
b9b8dee0: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b9b8dee0ae5711c53b988386f0a5179debee02e7'
* commit '
b9b8dee0ae5711c53b988386f0a5179debee02e7':
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 14 Oct 2009 00:07:16 +0000 (17:07 -0700)]
am
c5020e28: I had completely forgotten that the alternative seek method in the music app was actually reachable, but monkey found it, and crashed it. Fixes bug
2177755.
Merge commit '
c5020e2833a6925aa1e6a753c9b922166e31e691'
* commit '
c5020e2833a6925aa1e6a753c9b922166e31e691':
I had completely forgotten that the alternative seek method in the
Marco Nelissen [Wed, 14 Oct 2009 00:03:02 +0000 (17:03 -0700)]
am
8e732ffd: Make sure we actually have an adapter before trying to access it. Fixes bug
2177763.
Merge commit '
8e732ffd92d538aaa9376b560b0ff2fc5ac78c43'
* commit '
8e732ffd92d538aaa9376b560b0ff2fc5ac78c43':
Make sure we actually have an adapter before trying to access it.
Marco Nelissen [Tue, 13 Oct 2009 23:57:59 +0000 (16:57 -0700)]
am
1c0d6005: Fix bug
2167616: create the playlists submenu in onPrepareOptionsMenu instead of onCreateOptionsMenu, so it\'s always up to date.
Merge commit '
1c0d6005816e6aaa53aff249c67a77b6290fede0'
* commit '
1c0d6005816e6aaa53aff249c67a77b6290fede0':
Fix bug
2167616: create the playlists submenu in onPrepareOptionsMenu instead of onCreateOptionsMenu, so it's always up to date.
Mark Wagner [Tue, 13 Oct 2009 23:57:59 +0000 (16:57 -0700)]
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Music
Mike Cleron [Tue, 13 Oct 2009 23:52:17 +0000 (16:52 -0700)]
am
2aaae5ee: am
6a470f06: Merge change I347fe57e into eclair
Merge commit '
2aaae5eed420d0272fb5d7edcaf6744ca66d80d7'
* commit '
2aaae5eed420d0272fb5d7edcaf6744ca66d80d7':
1915450: Make the music widget show pause state properly
Marco Nelissen [Tue, 13 Oct 2009 23:50:45 +0000 (16:50 -0700)]
am
197ad25d: Stop view dragging the correct way, so we don\'t end up recycling an in-use bitmap. (fixes bug
2176573)
Merge commit '
197ad25d057bfa4390f0f732d09c0d9f81c54582'
* commit '
197ad25d057bfa4390f0f732d09c0d9f81c54582':
Stop view dragging the correct way, so we don't end up recycling an in-use bitmap.
Eric Fischer [Tue, 13 Oct 2009 23:36:15 +0000 (16:36 -0700)]
Reimport translations.
Change-Id: I68ada36227417e8e60ebed018319dd929aebcacc
Eric Fischer [Tue, 13 Oct 2009 23:07:14 +0000 (16:07 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Tue, 13 Oct 2009 21:54:25 +0000 (14:54 -0700)]
Eric Fischer [Tue, 13 Oct 2009 19:04:03 +0000 (12:04 -0700)]
am
6f3ebb46: (-s ours) am
a0c7911a: (-s ours) am
a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6f3ebb469cf9bf1ff8fa0e30bcb796f7a7cf19ab'
* commit '
6f3ebb469cf9bf1ff8fa0e30bcb796f7a7cf19ab':
Import revised translations. DO NOT MERGE
Marco Nelissen [Tue, 13 Oct 2009 19:04:00 +0000 (12:04 -0700)]
am
b5e252ef: Make sure that there is nothing referring to the bitmap before recycling it. Hopefully this will fix bug
2157769.
Merge commit '
b5e252efe636571789d8ea7d9fe9800ad88260cc'
* commit '
b5e252efe636571789d8ea7d9fe9800ad88260cc':
Make sure that there is nothing referring to the bitmap before recycling it.
Marco Nelissen [Mon, 12 Oct 2009 22:59:52 +0000 (15:59 -0700)]
I had completely forgotten that the alternative seek method in the
music app was actually reachable, but monkey found it, and crashed it.
Fixes bug
2177755.
Marco Nelissen [Mon, 12 Oct 2009 19:29:09 +0000 (12:29 -0700)]
Make sure we actually have an adapter before trying to access it.
Fixes bug
2177763.
Marco Nelissen [Mon, 12 Oct 2009 16:24:12 +0000 (09:24 -0700)]
Fix bug
2167616: create the playlists submenu in onPrepareOptionsMenu instead of onCreateOptionsMenu, so it's always up to date.
Mike Cleron [Fri, 9 Oct 2009 19:37:40 +0000 (12:37 -0700)]
am
6a470f06: Merge change I347fe57e into eclair
Merge commit '
6a470f06a781b99a1656e14879459db110cef078' into eclair-plus-aosp
* commit '
6a470f06a781b99a1656e14879459db110cef078':
1915450: Make the music widget show pause state properly
Mike Cleron [Fri, 9 Oct 2009 19:37:31 +0000 (12:37 -0700)]
am
6a470f06: Merge change I347fe57e into eclair
Merge commit '
6a470f06a781b99a1656e14879459db110cef078' into eclair-mr2
* commit '
6a470f06a781b99a1656e14879459db110cef078':
1915450: Make the music widget show pause state properly
Android (Google) Code Review [Fri, 9 Oct 2009 19:31:25 +0000 (15:31 -0400)]
Merge change I347fe57e into eclair
* changes:
1915450: Make the music widget show pause state properly
Mike Cleron [Fri, 9 Oct 2009 19:26:28 +0000 (12:26 -0700)]
1915450: Make the music widget show pause state properly
Marco Nelissen [Fri, 9 Oct 2009 17:35:30 +0000 (10:35 -0700)]
Stop view dragging the correct way, so we don't end up recycling an in-use bitmap.
(fixes bug
2176573)
Eric Fischer [Fri, 9 Oct 2009 00:33:19 +0000 (17:33 -0700)]
am
a0c7911a: (-s ours) am
a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9' into eclair-mr2
* commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:13:47 +0000 (15:13 -0700)]
am
a0c7911a: am
a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9' into eclair-plus-aosp
* commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9':
Import revised translations. DO NOT MERGE
Marco Nelissen [Thu, 8 Oct 2009 22:13:43 +0000 (15:13 -0700)]
am
b5e252ef: Make sure that there is nothing referring to the bitmap before recycling it. Hopefully this will fix bug
2157769.
Merge commit '
b5e252efe636571789d8ea7d9fe9800ad88260cc' into eclair-plus-aosp
* commit '
b5e252efe636571789d8ea7d9fe9800ad88260cc':
Make sure that there is nothing referring to the bitmap before recycling it.
Eric Fischer [Thu, 8 Oct 2009 22:00:07 +0000 (15:00 -0700)]
am
a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a38ba1d91492cb46740043c732c8eac5d65788a6' into eclair
* commit '
a38ba1d91492cb46740043c732c8eac5d65788a6':
Import revised translations. DO NOT MERGE
Mike Cleron [Thu, 1 Oct 2009 20:39:01 +0000 (13:39 -0700)]
Mike Cleron [Thu, 1 Oct 2009 18:54:03 +0000 (11:54 -0700)]
Mike Cleron [Thu, 1 Oct 2009 18:12:15 +0000 (11:12 -0700)]
Marco Nelissen [Thu, 1 Oct 2009 17:15:41 +0000 (10:15 -0700)]
Make sure that there is nothing referring to the bitmap before recycling it.
Hopefully this will fix bug
2157769.
Mike Cleron [Thu, 1 Oct 2009 04:15:32 +0000 (21:15 -0700)]
Mike Cleron [Thu, 1 Oct 2009 01:28:37 +0000 (18:28 -0700)]
Fix widgets
Mike Cleron [Wed, 30 Sep 2009 08:36:00 +0000 (01:36 -0700)]
Mike Cleron [Wed, 30 Sep 2009 08:16:15 +0000 (01:16 -0700)]
Newer icons
Eric Fischer [Tue, 29 Sep 2009 23:43:32 +0000 (16:43 -0700)]
Import revised translations. DO NOT MERGE
Mike Cleron [Tue, 29 Sep 2009 07:51:35 +0000 (00:51 -0700)]
Mike Cleron [Tue, 29 Sep 2009 07:27:38 +0000 (00:27 -0700)]
New icons
Marco Nelissen [Fri, 25 Sep 2009 18:26:40 +0000 (11:26 -0700)]
am
d7c88e26: am
38ad8fdc: Merge change 27050 into eclair
Merge commit '
d7c88e2609d8329e2672dd214bafaa846508da77'
* commit '
d7c88e2609d8329e2672dd214bafaa846508da77':
The new tall screen layout really only works for a subset of tall screens,
Yu Shan Emily Lau [Fri, 25 Sep 2009 18:24:39 +0000 (11:24 -0700)]
am
340c3b54: am
3399eda8: Merge change 27014 into eclair
Merge commit '
340c3b549da9a682ff096ce29c0326d608bd0862'
* commit '
340c3b549da9a682ff096ce29c0326d608bd0862':
Modified the test case name into a more meaningful name.
Marco Nelissen [Fri, 25 Sep 2009 18:10:51 +0000 (11:10 -0700)]
am
745a2b28: am
c1017e5f: onStart() can now receive a null Intent, so deal with that.
Merge commit '
745a2b28a1781a864f68e56a15a5ded4debeaad5'
* commit '
745a2b28a1781a864f68e56a15a5ded4debeaad5':
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Fri, 25 Sep 2009 18:05:54 +0000 (11:05 -0700)]
am
8dd6cacc: am
f90b4e14: Merge change 26859 into eclair
Merge commit '
8dd6cacc2511148d4a976bea81efe2a7a5d611ce'
* commit '
8dd6cacc2511148d4a976bea81efe2a7a5d611ce':
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Marco Nelissen [Fri, 25 Sep 2009 17:51:10 +0000 (10:51 -0700)]
am
d7381c45: am
cabe6de4: Merge change 26657 into eclair
Merge commit '
d7381c451884fbcdd19659327d132561ead0f768'
* commit '
d7381c451884fbcdd19659327d132561ead0f768':
Fix title bar in album browser.
Marco Nelissen [Fri, 25 Sep 2009 17:43:28 +0000 (10:43 -0700)]
am
38ad8fdc: Merge change 27050 into eclair
Merge commit '
38ad8fdc42c0f1289bf824659b257fefc35fe25b' into eclair-plus-aosp
* commit '
38ad8fdc42c0f1289bf824659b257fefc35fe25b':
The new tall screen layout really only works for a subset of tall screens,
Android (Google) Code Review [Fri, 25 Sep 2009 17:40:01 +0000 (13:40 -0400)]
Merge change 27050 into eclair
* changes:
The new tall screen layout really only works for a subset of tall screens, so make it specific to the exact resolulion that it's meant for.
Marco Nelissen [Fri, 25 Sep 2009 16:23:36 +0000 (09:23 -0700)]
The new tall screen layout really only works for a subset of tall screens,
so make it specific to the exact resolulion that it's meant for.
Daniel Sandler [Fri, 25 Sep 2009 15:52:00 +0000 (08:52 -0700)]
am
53e3f5db: am
93db4939: Fix invalid XML in Music list view layout.
Merge commit '
53e3f5db8a3578b2c2efa1253b3ef0c5381cd671'
* commit '
53e3f5db8a3578b2c2efa1253b3ef0c5381cd671':
Fix invalid XML in Music list view layout.
Yu Shan Emily Lau [Fri, 25 Sep 2009 15:32:45 +0000 (08:32 -0700)]
am
3399eda8: Merge change 27014 into eclair
Merge commit '
3399eda8525d9515da90296ef730fd0affab20c3' into eclair-plus-aosp
* commit '
3399eda8525d9515da90296ef730fd0affab20c3':
Modified the test case name into a more meaningful name.
Android (Google) Code Review [Fri, 25 Sep 2009 15:26:13 +0000 (11:26 -0400)]
Merge change 27014 into eclair
* changes:
Modified the test case name into a more meaningful name.
Yu Shan Emily Lau [Fri, 25 Sep 2009 07:27:32 +0000 (00:27 -0700)]
Modified the test case name into a more meaningful name.
Marco Nelissen [Thu, 24 Sep 2009 21:16:44 +0000 (14:16 -0700)]
am
c1017e5f: onStart() can now receive a null Intent, so deal with that.
Merge commit '
c1017e5fe69da3a4ffd2bf7d0890a1a216265a61' into eclair-plus-aosp
* commit '
c1017e5fe69da3a4ffd2bf7d0890a1a216265a61':
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Thu, 24 Sep 2009 20:21:06 +0000 (13:21 -0700)]
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Thu, 24 Sep 2009 17:05:26 +0000 (10:05 -0700)]
am
f90b4e14: Merge change 26859 into eclair
Merge commit '
f90b4e14c0dbabc34681163bd4e1defb524c12e1' into eclair-plus-aosp
* commit '
f90b4e14c0dbabc34681163bd4e1defb524c12e1':
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Android (Google) Code Review [Thu, 24 Sep 2009 16:59:14 +0000 (12:59 -0400)]
Merge change 26859 into eclair
* changes:
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Marco Nelissen [Wed, 23 Sep 2009 23:38:34 +0000 (16:38 -0700)]
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Marco Nelissen [Wed, 23 Sep 2009 20:28:00 +0000 (13:28 -0700)]
am
cabe6de4: Merge change 26657 into eclair
Merge commit '
cabe6de41d7e1449267b482dbff4c6191870e457' into eclair-plus-aosp
* commit '
cabe6de41d7e1449267b482dbff4c6191870e457':
Fix title bar in album browser.
Android (Google) Code Review [Wed, 23 Sep 2009 20:19:33 +0000 (16:19 -0400)]
Merge change 26657 into eclair
* changes:
Fix title bar in album browser.
Marco Nelissen [Wed, 23 Sep 2009 20:11:06 +0000 (13:11 -0700)]
Fix title bar in album browser.
Daniel Sandler [Wed, 23 Sep 2009 18:07:47 +0000 (11:07 -0700)]
am
93db4939: Fix invalid XML in Music list view layout.
Merge commit '
93db4939c4adb99623df50b03650bcc2bb1473e2' into eclair-plus-aosp
* commit '
93db4939c4adb99623df50b03650bcc2bb1473e2':
Fix invalid XML in Music list view layout.
Daniel Sandler [Wed, 23 Sep 2009 17:49:52 +0000 (13:49 -0400)]
Fix invalid XML in Music list view layout.
Related to http://b/
2139600.
Yu Shan Emily Lau [Mon, 21 Sep 2009 21:10:19 +0000 (14:10 -0700)]
am
943a04ac: am
82b4bf76: Added the music player do nothing test case to add the basic line.
Merge commit '
943a04ace3fd6f449c14b8ff78dab80aaadef27f'
* commit '
943a04ace3fd6f449c14b8ff78dab80aaadef27f':
Added the music player do nothing test case to add the basic line.
Yu Shan Emily Lau [Mon, 21 Sep 2009 21:04:15 +0000 (14:04 -0700)]
am
82b4bf76: Added the music player do nothing test case to add the basic line.
Merge commit '
82b4bf7645c64e2d2af020b8ebce33268ce3c259' into eclair-plus-aosp
* commit '
82b4bf7645c64e2d2af020b8ebce33268ce3c259':
Added the music player do nothing test case to add the basic line.
Yu Shan Emily Lau [Mon, 21 Sep 2009 04:26:37 +0000 (21:26 -0700)]
Added the music player do nothing test case to add the basic line.
Eric Fischer [Thu, 17 Sep 2009 22:26:33 +0000 (15:26 -0700)]
am
395e77a2: (-s ours) am
db0769a8: Import revised translations. DO NOT MERGE
Merge commit '
395e77a2e44c76072991492a619f916c251e39bb'
* commit '
395e77a2e44c76072991492a619f916c251e39bb':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:16 +0000 (15:15 -0700)]
am
db0769a8: Import revised translations. DO NOT MERGE
Merge commit '
db0769a8b404e4cda6827178cc55b691b82cdbf0' into eclair-plus-aosp
* commit '
db0769a8b404e4cda6827178cc55b691b82cdbf0':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:34:51 +0000 (14:34 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Thu, 10 Sep 2009 17:03:20 +0000 (10:03 -0700)]
am
aa33c778: am
8f2b5a2d: Merge change 24529 into eclair
Merge commit '
aa33c778fab30713a29b0a703a45c18407604950'
* commit '
aa33c778fab30713a29b0a703a45c18407604950':
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Marco Nelissen [Thu, 10 Sep 2009 16:58:53 +0000 (09:58 -0700)]
am
8f2b5a2d: Merge change 24529 into eclair
Merge commit '
8f2b5a2d9bf33b794950fea96d92739d856cf831' into eclair-plus-aosp
* commit '
8f2b5a2d9bf33b794950fea96d92739d856cf831':
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Android (Google) Code Review [Thu, 10 Sep 2009 16:53:41 +0000 (12:53 -0400)]
Merge change 24529 into eclair
* changes:
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Marco Nelissen [Thu, 10 Sep 2009 15:35:36 +0000 (08:35 -0700)]
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Nick Pelly [Wed, 9 Sep 2009 23:28:33 +0000 (16:28 -0700)]
am
56d2b6eb: am
98647f16: Merge change 24278 into eclair
Merge commit '
56d2b6eb68fd876a3aed27194a19dcc49f1bcc75'
* commit '
56d2b6eb68fd876a3aed27194a19dcc49f1bcc75':
Update application for Bluetooth API change: deprecation of BluetoothError.