OSDN Git Service

android-x86/packages-apps-Music.git
14 years agoam 43709daf: (-s ours) am eb7e8dbd: am f6c42a62: (-s ours) Import revised translation...
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

14 years agoam eb7e8dbd: am f6c42a62: (-s ours) 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

14 years agoam f6c42a62: (-s ours) 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

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

14 years agoam bd97aee9: am 64de08b1: resolved conflicts for merge of 0657c9ef to eclair-mr2
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.

14 years agoam 64de08b1: resolved conflicts for merge of 0657c9ef to eclair-mr2
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.

14 years agoresolved conflicts for merge of 0657c9ef to eclair-mr2
Marco Nelissen [Tue, 20 Oct 2009 01:04:24 +0000 (18:04 -0700)]
resolved conflicts for merge of 0657c9ef to eclair-mr2

14 years agoPassion feature 2179737: allow the "now playing" activity to show without unlocking...
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.

14 years agoam 24152c6d: merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:19:06 +0000 (16:19 -0700)]
am 24152c6d: merge from open-source master

Merge commit '24152c6d4f1645ce02940573a1a33a60f2c7a74a'

* commit '24152c6d4f1645ce02940573a1a33a60f2c7a74a':

14 years agomerge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:17 +0000 (16:02 -0700)]
merge from open-source master

14 years agoam ed9782d4: Merge change If7b53aba into eclair-mr2
Marco Nelissen [Wed, 14 Oct 2009 16:11:37 +0000 (09:11 -0700)]
am ed9782d4: Merge change If7b53aba into eclair-mr2

Merge commit 'ed9782d4809928a400a294673b947cabd19ad28d'

* commit 'ed9782d4809928a400a294673b947cabd19ad28d':
  Fix monkey bug 2180463.

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

14 years agoam b9b8dee0: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoam c5020e28: I had completely forgotten that the alternative seek method in the music...
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

14 years agoam 8e732ffd: Make sure we actually have an adapter before trying to access it. Fixes...
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.

14 years agoam 1c0d6005: Fix bug 2167616: create the playlists submenu in onPrepareOptionsMenu...
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.

14 years agoMerge branch 'master' of ssh://android-git.corp.google.com:29418/platform/packages...
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

14 years agoam 2aaae5ee: am 6a470f06: Merge change I347fe57e into eclair
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

14 years agoam 197ad25d: Stop view dragging the correct way, so we don\'t end up recycling an...
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.

14 years agoReimport translations.
Eric Fischer [Tue, 13 Oct 2009 23:36:15 +0000 (16:36 -0700)]
Reimport translations.

Change-Id: I68ada36227417e8e60ebed018319dd929aebcacc

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

14 years agoFix monkey bug 2180463.
Marco Nelissen [Tue, 13 Oct 2009 21:54:25 +0000 (14:54 -0700)]
Fix monkey bug 2180463.

14 years agoam 6f3ebb46: (-s ours) am a0c7911a: (-s ours) am a38ba1d9: (-s ours) Import revised...
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

14 years agoam b5e252ef: Make sure that there is nothing referring to the bitmap before recycling...
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.

14 years agoI had completely forgotten that the alternative seek method in the
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.

14 years agoMake sure we actually have an adapter before trying to access it.
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.

14 years agoFix bug 2167616: create the playlists submenu in onPrepareOptionsMenu instead of...
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.

14 years agoam 6a470f06: Merge change I347fe57e into eclair
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

14 years agoam 6a470f06: Merge change I347fe57e into eclair
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

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

14 years ago1915450: 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

14 years agoStop view dragging the correct way, so we don't end up recycling an in-use bitmap.
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)

14 years agoam a0c7911a: (-s ours) am a38ba1d9: (-s ours) Import revised translations. DO NOT...
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

14 years agoam a0c7911a: am a38ba1d9: (-s ours) 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

14 years agoam b5e252ef: Make sure that there is nothing referring to the bitmap before recycling...
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.

14 years agoam a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoam 5c2a82b4: am 4a894016: Fix widgets
Mike Cleron [Thu, 1 Oct 2009 20:39:01 +0000 (13:39 -0700)]
am 5c2a82b4: am 4a894016: Fix widgets

Merge commit '5c2a82b411d9f56364ab4f29e222ef641d3223cf'

* commit '5c2a82b411d9f56364ab4f29e222ef641d3223cf':
  Fix widgets

14 years agoam 5342921f: am 1dfda4ce: Newer icons
Mike Cleron [Thu, 1 Oct 2009 18:54:03 +0000 (11:54 -0700)]
am 5342921f: am 1dfda4ce: Newer icons

Merge commit '5342921f71391b6047794273e59201aef2f85fb5'

* commit '5342921f71391b6047794273e59201aef2f85fb5':
  Newer icons

14 years agoam 90a232b5: am ac8aa42c: New icons
Mike Cleron [Thu, 1 Oct 2009 18:12:15 +0000 (11:12 -0700)]
am 90a232b5: am ac8aa42c: New icons

Merge commit '90a232b539e9a183c8339d7829e11ed864d6b149'

* commit '90a232b539e9a183c8339d7829e11ed864d6b149':
  New icons

14 years agoMake sure that there is nothing referring to the bitmap before recycling it.
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.

14 years agoam 4a894016: Fix widgets
Mike Cleron [Thu, 1 Oct 2009 04:15:32 +0000 (21:15 -0700)]
am 4a894016: Fix widgets

Merge commit '4a894016223b15e71134b2e9f82323d2a56e7978' into eclair-plus-aosp

* commit '4a894016223b15e71134b2e9f82323d2a56e7978':
  Fix widgets

14 years agoFix widgets
Mike Cleron [Thu, 1 Oct 2009 01:28:37 +0000 (18:28 -0700)]
Fix widgets

14 years agoam 1dfda4ce: Newer icons
Mike Cleron [Wed, 30 Sep 2009 08:36:00 +0000 (01:36 -0700)]
am 1dfda4ce: Newer icons

Merge commit '1dfda4ce9b8d1be45992b88795d98b7e5009ab14' into eclair-plus-aosp

* commit '1dfda4ce9b8d1be45992b88795d98b7e5009ab14':
  Newer icons

14 years agoNewer icons
Mike Cleron [Wed, 30 Sep 2009 08:16:15 +0000 (01:16 -0700)]
Newer icons

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

14 years agoam ac8aa42c: New icons
Mike Cleron [Tue, 29 Sep 2009 07:51:35 +0000 (00:51 -0700)]
am ac8aa42c: New icons

Merge commit 'ac8aa42c0f96757f7220cce88cf213df0a8dc435' into eclair-plus-aosp

* commit 'ac8aa42c0f96757f7220cce88cf213df0a8dc435':
  New icons

14 years agoNew icons
Mike Cleron [Tue, 29 Sep 2009 07:27:38 +0000 (00:27 -0700)]
New icons

14 years agoam d7c88e26: am 38ad8fdc: Merge change 27050 into eclair
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,

14 years agoam 340c3b54: am 3399eda8: Merge change 27014 into eclair
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.

14 years agoam 745a2b28: am c1017e5f: onStart() can now receive a null Intent, so deal with that.
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.

14 years agoam 8dd6cacc: am f90b4e14: Merge change 26859 into eclair
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.

14 years agoam d7381c45: am cabe6de4: Merge change 26657 into eclair
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.

14 years agoam 38ad8fdc: Merge change 27050 into eclair
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,

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

14 years agoThe new tall screen layout really only works for a subset of tall screens,
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.

14 years agoam 53e3f5db: am 93db4939: Fix invalid XML in Music list view layout.
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.

14 years agoam 3399eda8: Merge change 27014 into eclair
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.

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

14 years agoModified 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.

14 years agoam c1017e5f: onStart() can now receive a null Intent, so deal with that.
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.

14 years agoonStart() 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.

14 years agoam f90b4e14: Merge change 26859 into eclair
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.

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

14 years agoAdd a special playback activity layout for tall screens to make better use of the...
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.

14 years agoam cabe6de4: Merge change 26657 into eclair
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.

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

14 years agoFix title bar in album browser.
Marco Nelissen [Wed, 23 Sep 2009 20:11:06 +0000 (13:11 -0700)]
Fix title bar in album browser.

14 years agoam 93db4939: Fix invalid XML in Music list view layout.
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.

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

14 years agoam 943a04ac: am 82b4bf76: Added the music player do nothing test case to add the...
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.

14 years agoam 82b4bf76: 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.

14 years agoAdded 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.

14 years agoam 395e77a2: (-s ours) am db0769a8: Import revised translations. DO NOT MERGE
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

14 years agoam db0769a8: 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

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

14 years agoam aa33c778: am 8f2b5a2d: Merge change 24529 into eclair
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.

14 years agoam 8f2b5a2d: Merge change 24529 into eclair
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.

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

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

14 years agoam 56d2b6eb: am 98647f16: Merge change 24278 into eclair
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.

14 years agoam 3930b024: am 7a05298d: Only log the sd card status when it changed from last time.
Marco Nelissen [Wed, 9 Sep 2009 23:28:08 +0000 (16:28 -0700)]
am 3930b024: am 7a05298d: Only log the sd card status when it changed from last time.

Merge commit '3930b024b20e6af5654aa76b34eb9d512e380d02'

* commit '3930b024b20e6af5654aa76b34eb9d512e380d02':
  Only log the sd card status when it changed from last time.

14 years agoam 98647f16: Merge change 24278 into eclair
Nick Pelly [Wed, 9 Sep 2009 18:39:08 +0000 (11:39 -0700)]
am 98647f16: Merge change 24278 into eclair

Merge commit '98647f16607f26e282738efb3bd7fa1a92cefa16' into eclair-plus-aosp

* commit '98647f16607f26e282738efb3bd7fa1a92cefa16':
  Update application for Bluetooth API change: deprecation of BluetoothError.

14 years agoMerge change 24278 into eclair
Android (Google) Code Review [Wed, 9 Sep 2009 18:35:23 +0000 (14:35 -0400)]
Merge change 24278 into eclair

* changes:
  Update application for Bluetooth API change: deprecation of BluetoothError.

14 years agoam 7a05298d: Only log the sd card status when it changed from last time.
Marco Nelissen [Wed, 9 Sep 2009 18:29:39 +0000 (11:29 -0700)]
am 7a05298d: Only log the sd card status when it changed from last time.

Merge commit '7a05298d5af6f796f3a260fa60b11d1c029b4207' into eclair-plus-aosp

* commit '7a05298d5af6f796f3a260fa60b11d1c029b4207':
  Only log the sd card status when it changed from last time.

14 years agoam 323868ba: (-s ours) am 533b2de9: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 17:57:17 +0000 (10:57 -0700)]
am 323868ba: (-s ours) am 533b2de9: Import revised translations.  DO NOT MERGE

Merge commit '323868baab8846ed42ce11c56b382cfaf6720926'

* commit '323868baab8846ed42ce11c56b382cfaf6720926':
  Import revised translations.  DO NOT MERGE

14 years agoOnly log the sd card status when it changed from last time.
Marco Nelissen [Wed, 9 Sep 2009 17:34:11 +0000 (10:34 -0700)]
Only log the sd card status when it changed from last time.

14 years agoUpdate application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Wed, 9 Sep 2009 00:50:45 +0000 (17:50 -0700)]
Update application for Bluetooth API change: deprecation of BluetoothError.

14 years agoam 533b2de9: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 00:06:43 +0000 (17:06 -0700)]
am 533b2de9: Import revised translations.  DO NOT MERGE

Merge commit '533b2de9df49faa7cbcd101d89dd432f061a2e23' into eclair-plus-aosp

* commit '533b2de9df49faa7cbcd101d89dd432f061a2e23':
  Import revised translations.  DO NOT MERGE

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

14 years agoam c3cd44f8: merge from open-source master
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:13 +0000 (11:06 -0700)]
am c3cd44f8: merge from open-source master

Merge commit 'c3cd44f8a5e61d55c3d5bf874c5a4f67d55bfc8d'

* commit 'c3cd44f8a5e61d55c3d5bf874c5a4f67d55bfc8d':

14 years agomerge from open-source master
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:22 +0000 (07:51 -0700)]
merge from open-source master

14 years agomerge from donut
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:14 +0000 (14:13 -0700)]
merge from donut

14 years agoam 9df6e737: Don\'t crash when long-pressing on a stream.
Marco Nelissen [Wed, 2 Sep 2009 20:35:19 +0000 (13:35 -0700)]
am 9df6e737: Don\'t crash when long-pressing on a stream.

Merge commit '9df6e7376ac6c26b980bc352c62b7f6af8314b98'

* commit '9df6e7376ac6c26b980bc352c62b7f6af8314b98':
  Don't crash when long-pressing on a stream.

14 years agoam 1e5a5673: Show time in the form hh:mm:ss when the duration is 1 hour or more.
Marco Nelissen [Wed, 2 Sep 2009 20:34:31 +0000 (13:34 -0700)]
am 1e5a5673: Show time in the form hh:mm:ss when the duration is 1 hour or more.

Merge commit '1e5a567390e41045cba6abac1d2c94eb8f59fc30'

* commit '1e5a567390e41045cba6abac1d2c94eb8f59fc30':
  Show time in the form hh:mm:ss when the duration is 1 hour or more.

14 years agoDon't crash when long-pressing on a stream.
Marco Nelissen [Wed, 2 Sep 2009 20:00:49 +0000 (13:00 -0700)]
Don't crash when long-pressing on a stream.

14 years agoShow time in the form hh:mm:ss when the duration is 1 hour or more.
Marco Nelissen [Wed, 2 Sep 2009 18:09:15 +0000 (11:09 -0700)]
Show time in the form hh:mm:ss when the duration is 1 hour or more.

14 years agoam 42bcc218: Fix some issues with threads/handlers accessing the adapter for the...
Marco Nelissen [Tue, 1 Sep 2009 23:13:31 +0000 (16:13 -0700)]
am 42bcc218: Fix some issues with threads/handlers accessing the adapter for the \'old\' activity after it has been handed off to the \'new\' activity.

Merge commit '42bcc218ce4c330cc609326d168e288f3559c64f'

* commit '42bcc218ce4c330cc609326d168e288f3559c64f':
  Fix some issues with threads/handlers accessing the adapter for the 'old' activity after it has been handed off to the 'new' activity.

14 years agoFix some issues with threads/handlers accessing the adapter for the 'old' activity...
Marco Nelissen [Tue, 1 Sep 2009 20:22:19 +0000 (13:22 -0700)]
Fix some issues with threads/handlers accessing the adapter for the 'old' activity after it has been handed off to the 'new' activity.

14 years agoam 2df1aa67: Merge change 23119 into eclair
Yu Shan Emily Lau [Fri, 28 Aug 2009 21:22:04 +0000 (14:22 -0700)]
am 2df1aa67: Merge change 23119 into eclair

Merge commit '2df1aa67b60c343d32e815be82307a779c24b70c'

* commit '2df1aa67b60c343d32e815be82307a779c24b70c':
  modified:   tests/src/com/android/music/MusicPlayerFunctionalTestRunner.java

14 years agoMerge change 23119 into eclair
Android (Google) Code Review [Fri, 28 Aug 2009 21:10:22 +0000 (14:10 -0700)]
Merge change 23119 into eclair

* changes:
   modified:   tests/src/com/android/music/MusicPlayerFunctionalTestRunner.java  new file:   tests/src/com/android/music/MusicPlayerStability.java  Add the test case for power measurment. The test case is simple play the mp3 thorough the music player for 30 seconds. It also check wehter there is any song in the song list.