OSDN Git Service

android-x86/packages-apps-Music.git
14 years agoMerge "Update the mdpi resources with 2.0 style icons"
Eugene Koh [Tue, 9 Feb 2010 20:16:10 +0000 (12:16 -0800)]
Merge "Update the mdpi resources with 2.0 style icons"

14 years agoMerge "Report playback state change at the end of the playlist. Fixes bug 2209568...
Marco Nelissen [Mon, 8 Feb 2010 20:08:48 +0000 (12:08 -0800)]
Merge "Report playback state change at the end of the playlist. Fixes bug 2209568 (change b05fe176ddb1c811302c69547bb1cff5a5a2df3d from Music2)"

14 years agoReport playback state change at the end of the playlist.
Marco Nelissen [Mon, 8 Feb 2010 19:00:29 +0000 (11:00 -0800)]
Report playback state change at the end of the playlist.
Fixes bug 2209568
(change b05fe176ddb1c811302c69547bb1cff5a5a2df3d from Music2)

14 years agoUpdate the mdpi resources with 2.0 style icons
Bai Tao [Mon, 8 Feb 2010 07:15:38 +0000 (15:15 +0800)]
Update the mdpi resources with 2.0 style icons

14 years agoam 67bebd06: am 0749a3f1: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 22:18:17 +0000 (14:18 -0800)]
am 67bebd06: am 0749a3f1: reconcile main tree with open-source eclair

Merge commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186'

* commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186':
  android-2.1_r1 snapshot

14 years agoam 0749a3f1: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:46:28 +0000 (08:46 -0800)]
am 0749a3f1: reconcile main tree with open-source eclair

Merge commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331' into eclair-plus-aosp

* commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331':
  android-2.1_r1 snapshot

14 years agoreconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:40 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair

14 years agoFix out of bounds array access that the monkey managed to trigger.
Marco Nelissen [Tue, 2 Feb 2010 01:01:22 +0000 (17:01 -0800)]
Fix out of bounds array access that the monkey managed to trigger.
(http://b/2396067)

14 years agoreconcile android-2.1_r1 snapshot
The Android Open Source Project [Fri, 29 Jan 2010 22:09:26 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot

14 years agoMake the bind/unbind utility methods work for activities in an activitygroup too.
Marco Nelissen [Thu, 28 Jan 2010 02:44:52 +0000 (18:44 -0800)]
Make the bind/unbind utility methods work for activities in an activitygroup too.

14 years agoBackport changes 7e94887988990e98b5c7738f393e10afa0d8ddb8 and fb5674fd0aa46a186dba929...
Marco Nelissen [Wed, 27 Jan 2010 23:35:43 +0000 (15:35 -0800)]
Backport changes 7e94887988990e98b5c7738f393e10afa0d8ddb8 and fb5674fd0aa46a186dba92965fc5d11cd2630394
from Music2, to make it easier to share code between the two.

14 years agoOne step closer to unbundling. Build against the current SDK, and use
Marco Nelissen [Wed, 27 Jan 2010 17:46:40 +0000 (09:46 -0800)]
One step closer to unbundling. Build against the current SDK, and use
fully qualified java package names in the manifest.

14 years agoMerge optimization back from Music2
Marco Nelissen [Tue, 26 Jan 2010 18:21:13 +0000 (10:21 -0800)]
Merge optimization back from Music2

14 years agoRemove a bunch of unused layouts and drawables from the music app
Marco Nelissen [Fri, 15 Jan 2010 00:21:40 +0000 (16:21 -0800)]
Remove a bunch of unused layouts and drawables from the music app

14 years agoFix a problem with the "scanning card" dialog popping up when quickly
Marco Nelissen [Wed, 13 Jan 2010 18:07:52 +0000 (10:07 -0800)]
Fix a problem with the "scanning card" dialog popping up when quickly
cycling through tabs.

14 years agoandroid-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:15 +0000 (15:19 -0800)]
android-2.1_r1 snapshot

14 years agob/2343548
Marco Nelissen [Tue, 12 Jan 2010 21:58:12 +0000 (13:58 -0800)]
b/2343548
Fix the "recently added" spinner.

14 years agoFix package ref in layout. (b/2363099)
Marco Nelissen [Tue, 12 Jan 2010 18:58:58 +0000 (10:58 -0800)]
Fix package ref in layout. (b/2363099)

14 years agoAdd missing mdpi resources (b/2353729)
Marco Nelissen [Mon, 11 Jan 2010 21:12:22 +0000 (13:12 -0800)]
Add missing mdpi resources (b/2353729)

14 years agoDeprecate fill_parent and introduce match_parent.
Romain Guy [Fri, 8 Jan 2010 23:07:04 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.

14 years agoMerge "Update with latest translations."
Eric Fischer [Fri, 8 Jan 2010 18:04:10 +0000 (10:04 -0800)]
Merge "Update with latest translations."

14 years agoMusic app unbundling prep: add SortCursor to the music app, make
Marco Nelissen [Thu, 24 Dec 2009 00:18:45 +0000 (16:18 -0800)]
Music app unbundling prep: add SortCursor to the music app, make
it get the card id from the media provider, and clean up imports.
(http://b/2363099)

14 years agoUpdate with latest translations.
Eric Fischer [Thu, 7 Jan 2010 23:58:53 +0000 (15:58 -0800)]
Update with latest translations.

14 years agoClean up imports.
Marco Nelissen [Wed, 6 Jan 2010 22:03:59 +0000 (14:03 -0800)]
Clean up imports.

14 years agoCopy fast scroll alphabet and other resources in to the music app.
Marco Nelissen [Wed, 6 Jan 2010 20:46:49 +0000 (12:46 -0800)]
Copy fast scroll alphabet and other resources in to the music app.

14 years agoDo not use a user tag on apps, as it is ignored.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:24 +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: I9ac487ea59f8407bee06d6034e7f566a5f606d2e

14 years agoMove drawables for VerticalTextSpinner in to music app, update
Marco Nelissen [Wed, 6 Jan 2010 00:39:21 +0000 (16:39 -0800)]
Move drawables for VerticalTextSpinner in to music app, update
VerticalTextSpinner accordingly, fix whitespace issues.

14 years agoMove VerticalTextSpinner in to the music app, since that's the only thing using it...
Marco Nelissen [Tue, 5 Jan 2010 22:13:21 +0000 (14:13 -0800)]
Move VerticalTextSpinner in to the music app, since that's the only thing using it anyway.

14 years agoUse shiny new MatrixCursor instead of dull old ArrayListCursor.
Marco Nelissen [Tue, 5 Jan 2010 00:55:00 +0000 (16:55 -0800)]
Use shiny new MatrixCursor instead of dull old ArrayListCursor.

14 years agoDon't use mContext directly, since that prevents unbundling.
Marco Nelissen [Mon, 4 Jan 2010 23:31:21 +0000 (15:31 -0800)]
Don't use mContext directly, since that prevents unbundling.

14 years agoMediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING
Marco Nelissen [Mon, 4 Jan 2010 23:01:18 +0000 (15:01 -0800)]
MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING

14 years agoam 17d90662: am d74594d4: Update imports to android-common
Tom Taylor [Tue, 22 Dec 2009 01:24:31 +0000 (17:24 -0800)]
am 17d90662: am d74594d4: Update imports to android-common

Merge commit '17d90662691870dea11aecf7dde7d443405f0cd3'

* commit '17d90662691870dea11aecf7dde7d443405f0cd3':
  Update imports to android-common

14 years agoam d74594d4: Update imports to android-common
Tom Taylor [Mon, 21 Dec 2009 23:44:17 +0000 (15:44 -0800)]
am d74594d4: Update imports to android-common

Merge commit 'd74594d41fe303de2fd004377ffb0e800fda4c48' into eclair-mr2-plus-aosp

* commit 'd74594d41fe303de2fd004377ffb0e800fda4c48':
  Update imports to android-common

14 years agoUpdate imports to android-common
Tom Taylor [Mon, 21 Dec 2009 22:01:18 +0000 (14:01 -0800)]
Update imports to android-common

Several files were moved to android-common. Update all the references
to import those files from the new location.

14 years agoFix bug that would cause item to be dropped at position 0.
Marco Nelissen [Wed, 16 Dec 2009 19:28:10 +0000 (11:28 -0800)]
Fix bug that would cause item to be dropped at position 0.

14 years agoCheckout for currently unused fling mode.
Marco Nelissen [Wed, 16 Dec 2009 18:56:17 +0000 (10:56 -0800)]
Checkout for currently unused fling mode.

14 years agoam a06e92b2: am 3193d7dd: Show album art in the background of the song list for an...
Marco Nelissen [Tue, 15 Dec 2009 23:06:23 +0000 (15:06 -0800)]
am a06e92b2: am 3193d7dd: Show album art in the background of the song list for an album.

Merge commit 'a06e92b245a3d0061731f26ed2daf2fbf3ebf9ea'

* commit 'a06e92b245a3d0061731f26ed2daf2fbf3ebf9ea':
  Show album art in the background of the song list for an album.

14 years agoam bc537359: am 78ef6426: Merge change Iac35b994 into eclair
Marco Nelissen [Tue, 15 Dec 2009 23:05:43 +0000 (15:05 -0800)]
am bc537359: am 78ef6426: Merge change Iac35b994 into eclair

Merge commit 'bc5373595734b27b6bc6bf969685dcf562e28925'

* commit 'bc5373595734b27b6bc6bf969685dcf562e28925':
  Fix tab widths.

14 years agoam 02da1230: am 4c883a53: Merge change I19cea9e1 into eclair
Marco Nelissen [Tue, 15 Dec 2009 23:03:42 +0000 (15:03 -0800)]
am 02da1230: am 4c883a53: Merge change I19cea9e1 into eclair

Merge commit '02da12304de244ed759e767f655b8d7ec44e3d4e'

* commit '02da12304de244ed759e767f655b8d7ec44e3d4e':
  Fix scroll position of album songs list.

14 years agoam 1dfd0efa: am 52f70b2e: Fix bug with other apps launching the music app to play...
Marco Nelissen [Tue, 15 Dec 2009 23:03:38 +0000 (15:03 -0800)]
am 1dfd0efa: am 52f70b2e: Fix bug with other apps launching the music app to play a song.

Merge commit '1dfd0efabffc1a5994c61939c3acff943156cb46'

* commit '1dfd0efabffc1a5994c61939c3acff943156cb46':
  Fix bug with other apps launching the music app to play a song.

14 years agoam 3193d7dd: Show album art in the background of the song list for an album.
Marco Nelissen [Tue, 15 Dec 2009 21:48:54 +0000 (13:48 -0800)]
am 3193d7dd: Show album art in the background of the song list for an album.

Merge commit '3193d7dda28d5c31b318b024db4df40b949071d5' into eclair-plus-aosp

* commit '3193d7dda28d5c31b318b024db4df40b949071d5':
  Show album art in the background of the song list for an album.

14 years agoShow album art in the background of the song list for an album.
Marco Nelissen [Mon, 14 Dec 2009 23:31:28 +0000 (15:31 -0800)]
Show album art in the background of the song list for an album.

14 years agoam 78ef6426: Merge change Iac35b994 into eclair
Marco Nelissen [Tue, 15 Dec 2009 17:57:09 +0000 (09:57 -0800)]
am 78ef6426: Merge change Iac35b994 into eclair

Merge commit '78ef6426add623c8a86f87a589f44a11f8805c69' into eclair-plus-aosp

* commit '78ef6426add623c8a86f87a589f44a11f8805c69':
  Fix tab widths.

14 years agoMerge change Iac35b994 into eclair
Android (Google) Code Review [Tue, 15 Dec 2009 17:53:18 +0000 (09:53 -0800)]
Merge change Iac35b994 into eclair

* changes:
  Fix tab widths.

14 years agoFix tab widths.
Marco Nelissen [Tue, 15 Dec 2009 17:39:07 +0000 (09:39 -0800)]
Fix tab widths.

14 years agoam 4c883a53: Merge change I19cea9e1 into eclair
Marco Nelissen [Tue, 15 Dec 2009 15:41:05 +0000 (07:41 -0800)]
am 4c883a53: Merge change I19cea9e1 into eclair

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

* commit '4c883a539ca201423e68b8941a4559b0e84a15ae':
  Fix scroll position of album songs list.

14 years agoam 52f70b2e: Fix bug with other apps launching the music app to play a song.
Marco Nelissen [Tue, 15 Dec 2009 15:39:07 +0000 (07:39 -0800)]
am 52f70b2e: Fix bug with other apps launching the music app to play a song.

Merge commit '52f70b2e8eec4db1ee55ba55f92c70d2090ee412' into eclair-plus-aosp

* commit '52f70b2e8eec4db1ee55ba55f92c70d2090ee412':
  Fix bug with other apps launching the music app to play a song.

14 years agoMerge commit 'goog/eclair-plus-aosp'
Android Git Automerger [Tue, 15 Dec 2009 08:45:06 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'

14 years agoMerge change I19cea9e1 into eclair
Android (Google) Code Review [Tue, 15 Dec 2009 00:35:27 +0000 (16:35 -0800)]
Merge change I19cea9e1 into eclair

* changes:
  Fix scroll position of album songs list.

14 years agoFix scroll position of album songs list.
Marco Nelissen [Mon, 14 Dec 2009 23:59:30 +0000 (15:59 -0800)]
Fix scroll position of album songs list.

14 years agoFix bug with other apps launching the music app to play a song.
Marco Nelissen [Mon, 14 Dec 2009 20:44:54 +0000 (12:44 -0800)]
Fix bug with other apps launching the music app to play a song.

14 years agoam a75a6420: am 74928941: am 333bf194: More Music fit & finish fixes.
Jeff Hamilton [Mon, 14 Dec 2009 07:02:54 +0000 (23:02 -0800)]
am a75a6420: am 74928941: am 333bf194: More Music fit & finish fixes.

Merge commit 'a75a64204bdd3f6e7eeb2ef70e55b113b26f0f00'

* commit 'a75a64204bdd3f6e7eeb2ef70e55b113b26f0f00':
  More Music fit & finish fixes.

14 years agoam 74928941: am 333bf194: More Music fit & finish fixes.
Jeff Hamilton [Mon, 14 Dec 2009 07:00:46 +0000 (23:00 -0800)]
am 74928941: am 333bf194: More Music fit & finish fixes.

Merge commit '74928941df24fb77dcd5de8d7ead3c1bebc6182f' into eclair-mr2-plus-aosp

* commit '74928941df24fb77dcd5de8d7ead3c1bebc6182f':
  More Music fit & finish fixes.

14 years agoam 333bf194: More Music fit & finish fixes.
Jeff Hamilton [Mon, 14 Dec 2009 06:58:29 +0000 (22:58 -0800)]
am 333bf194: More Music fit & finish fixes.

Merge commit '333bf1945f859968dcb9783b694aa64b788fc771' into eclair-mr2

* commit '333bf1945f859968dcb9783b694aa64b788fc771':
  More Music fit & finish fixes.

14 years agoam 333bf194: More Music fit & finish fixes.
Jeff Hamilton [Mon, 14 Dec 2009 06:58:25 +0000 (22:58 -0800)]
am 333bf194: More Music fit & finish fixes.

Merge commit '333bf1945f859968dcb9783b694aa64b788fc771' into eclair-plus-aosp

* commit '333bf1945f859968dcb9783b694aa64b788fc771':
  More Music fit & finish fixes.

14 years agoMore Music fit & finish fixes.
Jeff Hamilton [Mon, 14 Dec 2009 06:48:30 +0000 (00:48 -0600)]
More Music fit & finish fixes.

- Don't flash the unused title bar when launching
- Fix a flickering issue when switching tabs

Change-Id: Iba4a5bbb8403d76cc02601922970ea341815551b
Bug: 2324645

14 years agoam 33920f68: am 035529c5: am 23515dda: Fix the text color and background drawable...
Jeff Hamilton [Mon, 14 Dec 2009 05:50:42 +0000 (21:50 -0800)]
am 33920f68: am 035529c5: am 23515dda: Fix the text color and background drawable for the new tabs.

Merge commit '33920f6884a6e7ac0ffcc21765bf1bbfdff2d0e1'

* commit '33920f6884a6e7ac0ffcc21765bf1bbfdff2d0e1':
  Fix the text color and background drawable for the new tabs.

14 years agoam 035529c5: am 23515dda: Fix the text color and background drawable for the new...
Jeff Hamilton [Mon, 14 Dec 2009 05:47:44 +0000 (21:47 -0800)]
am 035529c5: am 23515dda: Fix the text color and background drawable for the new tabs.

Merge commit '035529c5c67efb95c6ee2b64939b1cb13f2d837c' into eclair-mr2-plus-aosp

* commit '035529c5c67efb95c6ee2b64939b1cb13f2d837c':
  Fix the text color and background drawable for the new tabs.

14 years agoam 23515dda: Fix the text color and background drawable for the new tabs.
Jeff Hamilton [Mon, 14 Dec 2009 05:44:56 +0000 (21:44 -0800)]
am 23515dda: Fix the text color and background drawable for the new tabs.

Merge commit '23515ddaa9bed9ebc9e3ef33ff46202fb982df1e' into eclair-plus-aosp

* commit '23515ddaa9bed9ebc9e3ef33ff46202fb982df1e':
  Fix the text color and background drawable for the new tabs.

14 years agoam 23515dda: Fix the text color and background drawable for the new tabs.
Jeff Hamilton [Mon, 14 Dec 2009 05:44:52 +0000 (21:44 -0800)]
am 23515dda: Fix the text color and background drawable for the new tabs.

Merge commit '23515ddaa9bed9ebc9e3ef33ff46202fb982df1e' into eclair-mr2

* commit '23515ddaa9bed9ebc9e3ef33ff46202fb982df1e':
  Fix the text color and background drawable for the new tabs.

14 years agoFix the text color and background drawable for the new tabs.
Jeff Hamilton [Mon, 14 Dec 2009 05:28:26 +0000 (23:28 -0600)]
Fix the text color and background drawable for the new tabs.

Bug: 2324578
Change-Id: I57303789c3bfed883e7d28ea35df451fca8abcb0

14 years agoam 4ad325bd: am 9f59af07: am a58948b5: Make the music widget launch the right activity.
Marco Nelissen [Sun, 13 Dec 2009 20:39:22 +0000 (12:39 -0800)]
am 4ad325bd: am 9f59af07: am a58948b5: Make the music widget launch the right activity.

Merge commit '4ad325bdbe1d8b0124213f4268cd1d8876d2cd37'

* commit '4ad325bdbe1d8b0124213f4268cd1d8876d2cd37':
  Make the music widget launch the right activity.

14 years agoam 4197f91f: am deee46da: am 23b531ec: Fix more bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:39:08 +0000 (12:39 -0800)]
am 4197f91f: am deee46da: am 23b531ec: Fix more bugs when no music is present.

Merge commit '4197f91fa6e60efbf1b087cc5f523d23734c4d74'

* commit '4197f91fa6e60efbf1b087cc5f523d23734c4d74':
  Fix more bugs when no music is present.

14 years agoam db13c6d5: am 5eee7a63: am 9e0f1fde: Fix some bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:39:05 +0000 (12:39 -0800)]
am db13c6d5: am 5eee7a63: am 9e0f1fde: Fix some bugs when no music is present.

Merge commit 'db13c6d5dea28f979f3f744f703d95b7a2ae013c'

* commit 'db13c6d5dea28f979f3f744f703d95b7a2ae013c':
  Fix some bugs when no music is present.

14 years agoam ed52d14c: am e4f46313: am 5edd0cbd: Fix build.
Marco Nelissen [Sun, 13 Dec 2009 20:39:01 +0000 (12:39 -0800)]
am ed52d14c: am e4f46313: am 5edd0cbd: Fix build.

Merge commit 'ed52d14cc9447a185dabb2ea595157e9520e2785'

* commit 'ed52d14cc9447a185dabb2ea595157e9520e2785':
  Fix build.

14 years agoam c23f6990: am 5ceafe72: am ec0c57a4: Music player UI refresh.
Marco Nelissen [Sun, 13 Dec 2009 20:38:57 +0000 (12:38 -0800)]
am c23f6990: am 5ceafe72: am ec0c57a4: Music player UI refresh.

Merge commit 'c23f6990890bcb687bc8dec508949bd50e1c34ec'

* commit 'c23f6990890bcb687bc8dec508949bd50e1c34ec':
  Music player UI refresh.

14 years agoam 9f59af07: am a58948b5: Make the music widget launch the right activity.
Marco Nelissen [Sun, 13 Dec 2009 20:32:34 +0000 (12:32 -0800)]
am 9f59af07: am a58948b5: Make the music widget launch the right activity.

Merge commit '9f59af07a8001ab1d6cbfac6996cca04ab615380' into eclair-mr2-plus-aosp

* commit '9f59af07a8001ab1d6cbfac6996cca04ab615380':
  Make the music widget launch the right activity.

14 years agoam deee46da: am 23b531ec: Fix more bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:32:31 +0000 (12:32 -0800)]
am deee46da: am 23b531ec: Fix more bugs when no music is present.

Merge commit 'deee46dac7e2fcd6210d2afdb618377379cc7c4e' into eclair-mr2-plus-aosp

* commit 'deee46dac7e2fcd6210d2afdb618377379cc7c4e':
  Fix more bugs when no music is present.

14 years agoam 5eee7a63: am 9e0f1fde: Fix some bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:32:27 +0000 (12:32 -0800)]
am 5eee7a63: am 9e0f1fde: Fix some bugs when no music is present.

Merge commit '5eee7a6317774f617b50489aea5c324f864ce597' into eclair-mr2-plus-aosp

* commit '5eee7a6317774f617b50489aea5c324f864ce597':
  Fix some bugs when no music is present.

14 years agoam e4f46313: am 5edd0cbd: Fix build.
Marco Nelissen [Sun, 13 Dec 2009 20:32:23 +0000 (12:32 -0800)]
am e4f46313: am 5edd0cbd: Fix build.

Merge commit 'e4f4631308bbc41f2fbdc19144cccf70406419e3' into eclair-mr2-plus-aosp

* commit 'e4f4631308bbc41f2fbdc19144cccf70406419e3':
  Fix build.

14 years agoam 5ceafe72: am ec0c57a4: Music player UI refresh.
Marco Nelissen [Sun, 13 Dec 2009 20:32:19 +0000 (12:32 -0800)]
am 5ceafe72: am ec0c57a4: Music player UI refresh.

Merge commit '5ceafe72378d7e9384204e0574af2e5bd563b51f' into eclair-mr2-plus-aosp

* commit '5ceafe72378d7e9384204e0574af2e5bd563b51f':
  Music player UI refresh.

14 years agoam a58948b5: Make the music widget launch the right activity.
Marco Nelissen [Sun, 13 Dec 2009 20:26:03 +0000 (12:26 -0800)]
am a58948b5: Make the music widget launch the right activity.

Merge commit 'a58948b5a2b4a79e33aaa3abdac90247ddf474a6' into eclair-mr2

* commit 'a58948b5a2b4a79e33aaa3abdac90247ddf474a6':
  Make the music widget launch the right activity.

14 years agoam 23b531ec: Fix more bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:25:59 +0000 (12:25 -0800)]
am 23b531ec: Fix more bugs when no music is present.

Merge commit '23b531ec31c406f96fca82bfb9b04e26d05187b4' into eclair-mr2

* commit '23b531ec31c406f96fca82bfb9b04e26d05187b4':
  Fix more bugs when no music is present.

14 years agoam 9e0f1fde: Fix some bugs when no music is present.
Marco Nelissen [Sun, 13 Dec 2009 20:25:55 +0000 (12:25 -0800)]
am 9e0f1fde: Fix some bugs when no music is present.

Merge commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9' into eclair-mr2

* commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9':
  Fix some bugs when no music is present.

14 years agoam 5edd0cbd: Fix build.
Marco Nelissen [Sun, 13 Dec 2009 20:25:52 +0000 (12:25 -0800)]
am 5edd0cbd: Fix build.

Merge commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c' into eclair-mr2

* commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c':
  Fix build.

14 years agoam ec0c57a4: Music player UI refresh.
Marco Nelissen [Sun, 13 Dec 2009 20:25:47 +0000 (12:25 -0800)]
am ec0c57a4: Music player UI refresh.

Merge commit 'ec0c57a414c3563ebbf5767d92787a6a3f4a8820' into eclair-mr2

* commit 'ec0c57a414c3563ebbf5767d92787a6a3f4a8820':
  Music player UI refresh.

14 years agoam a58948b5: Make the music widget launch the right activity.
Marco Nelissen [Sat, 12 Dec 2009 22:28:04 +0000 (14:28 -0800)]
am a58948b5: Make the music widget launch the right activity.

Merge commit 'a58948b5a2b4a79e33aaa3abdac90247ddf474a6' into eclair-plus-aosp

* commit 'a58948b5a2b4a79e33aaa3abdac90247ddf474a6':
  Make the music widget launch the right activity.

14 years agoMake the music widget launch the right activity.
Marco Nelissen [Sat, 12 Dec 2009 22:23:31 +0000 (14:23 -0800)]
Make the music widget launch the right activity.

14 years agoam 23b531ec: Fix more bugs when no music is present.
Marco Nelissen [Sat, 12 Dec 2009 22:12:23 +0000 (14:12 -0800)]
am 23b531ec: Fix more bugs when no music is present.

Merge commit '23b531ec31c406f96fca82bfb9b04e26d05187b4' into eclair-plus-aosp

* commit '23b531ec31c406f96fca82bfb9b04e26d05187b4':
  Fix more bugs when no music is present.

14 years agoFix more bugs when no music is present.
Marco Nelissen [Sat, 12 Dec 2009 22:07:59 +0000 (14:07 -0800)]
Fix more bugs when no music is present.

14 years agoam 9e0f1fde: Fix some bugs when no music is present.
Marco Nelissen [Sat, 12 Dec 2009 21:44:36 +0000 (13:44 -0800)]
am 9e0f1fde: Fix some bugs when no music is present.

Merge commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9' into eclair-plus-aosp

* commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9':
  Fix some bugs when no music is present.

14 years agoFix some bugs when no music is present.
Marco Nelissen [Sat, 12 Dec 2009 21:41:34 +0000 (13:41 -0800)]
Fix some bugs when no music is present.

14 years agoam 5edd0cbd: Fix build.
Marco Nelissen [Sat, 12 Dec 2009 21:30:57 +0000 (13:30 -0800)]
am 5edd0cbd: Fix build.

Merge commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c' into eclair-plus-aosp

* commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c':
  Fix build.

14 years agoFix build.
Marco Nelissen [Sat, 12 Dec 2009 21:27:50 +0000 (13:27 -0800)]
Fix build.

14 years agoam ec0c57a4: Music player UI refresh.
Marco Nelissen [Sat, 12 Dec 2009 21:09:17 +0000 (13:09 -0800)]
am ec0c57a4: Music player UI refresh.

Merge commit 'ec0c57a414c3563ebbf5767d92787a6a3f4a8820' into eclair-plus-aosp

* commit 'ec0c57a414c3563ebbf5767d92787a6a3f4a8820':
  Music player UI refresh.

14 years agoMusic player UI refresh.
Marco Nelissen [Sat, 12 Dec 2009 20:27:11 +0000 (12:27 -0800)]
Music player UI refresh.

14 years agoam 7258bbff: (-s ours) am 088a49ec: am d7620a5a: (-s ours) Import revised translation...
Eric Fischer [Fri, 11 Dec 2009 07:40:44 +0000 (23:40 -0800)]
am 7258bbff: (-s ours) am 088a49ec: am d7620a5a: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '7258bbffea64b46630a8a1cd44adbb5e4e1687e6'

* commit '7258bbffea64b46630a8a1cd44adbb5e4e1687e6':
  Import revised translations.  DO NOT MERGE

14 years agoam 088a49ec: am d7620a5a: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:52:42 +0000 (17:52 -0800)]
am 088a49ec: am d7620a5a: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '088a49ecad2dbd7508a5976cfb6acea2c81eef06' into eclair-mr2-plus-aosp

* commit '088a49ecad2dbd7508a5976cfb6acea2c81eef06':
  Import revised translations.  DO NOT MERGE

14 years agoam d7620a5a: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:43:40 +0000 (17:43 -0800)]
am d7620a5a: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'd7620a5aa589943769f281790b47952fffb52006' into eclair-mr2

* commit 'd7620a5aa589943769f281790b47952fffb52006':
  Import revised translations.  DO NOT MERGE

14 years agoam 70e38bd6: am 5793455e: Make moving an entry in a playlist a lot faster.
Marco Nelissen [Thu, 10 Dec 2009 14:57:58 +0000 (06:57 -0800)]
am 70e38bd6: am 5793455e: Make moving an entry in a playlist a lot faster.

Merge commit '70e38bd61ec7395fde6a50ec04c384cb5a4dffe2'

* commit '70e38bd61ec7395fde6a50ec04c384cb5a4dffe2':
  Make moving an entry in a playlist a lot faster.

14 years agoam d7620a5a: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 02:09:40 +0000 (18:09 -0800)]
am d7620a5a: Import revised translations.  DO NOT MERGE

Merge commit 'd7620a5aa589943769f281790b47952fffb52006' into eclair-plus-aosp

* commit 'd7620a5aa589943769f281790b47952fffb52006':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:27:31 +0000 (17:27 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 5793455e: Make moving an entry in a playlist a lot faster.
Marco Nelissen [Thu, 10 Dec 2009 00:01:36 +0000 (16:01 -0800)]
am 5793455e: Make moving an entry in a playlist a lot faster.

Merge commit '5793455e825626f2b07ed4022bfb7ae57e0519ae' into eclair-mr2-plus-aosp

* commit '5793455e825626f2b07ed4022bfb7ae57e0519ae':
  Make moving an entry in a playlist a lot faster.

14 years agoMake moving an entry in a playlist a lot faster.
Marco Nelissen [Wed, 9 Dec 2009 17:32:42 +0000 (09:32 -0800)]
Make moving an entry in a playlist a lot faster.

14 years agoam d38bb801: am 42131381: Fix monkey crash
Marco Nelissen [Fri, 4 Dec 2009 17:45:48 +0000 (09:45 -0800)]
am d38bb801: am 42131381: Fix monkey crash

Merge commit 'd38bb801a7c211339f9b7098c0b4f8e34cc00854'

* commit 'd38bb801a7c211339f9b7098c0b4f8e34cc00854':
  Fix monkey crash

14 years agoam 42131381: Fix monkey crash
Marco Nelissen [Fri, 4 Dec 2009 17:43:25 +0000 (09:43 -0800)]
am 42131381: Fix monkey crash

Merge commit '42131381e3c2a0403d2efc83a4504e1709c388f4' into eclair-mr2-plus-aosp

* commit '42131381e3c2a0403d2efc83a4504e1709c388f4':
  Fix monkey crash

14 years agoFix monkey crash
Marco Nelissen [Fri, 4 Dec 2009 17:40:22 +0000 (09:40 -0800)]
Fix monkey crash

14 years agoam 3822302d: am d99bc1e9: Make sure we actually clear the adapter\'s cursor when...
Marco Nelissen [Fri, 4 Dec 2009 16:54:18 +0000 (08:54 -0800)]
am 3822302d: am d99bc1e9: Make sure we actually clear the adapter\'s cursor when finishing.

Merge commit '3822302d2d923ccfe3b2e93f9b38156e357a572c'

* commit '3822302d2d923ccfe3b2e93f9b38156e357a572c':
  Make sure we actually clear the adapter's cursor when finishing.

14 years agoam d99bc1e9: Make sure we actually clear the adapter\'s cursor when finishing.
Marco Nelissen [Fri, 4 Dec 2009 16:52:18 +0000 (08:52 -0800)]
am d99bc1e9: Make sure we actually clear the adapter\'s cursor when finishing.

Merge commit 'd99bc1e9481c68514a4e5eea4c3f429843b701b4' into eclair-mr2-plus-aosp

* commit 'd99bc1e9481c68514a4e5eea4c3f429843b701b4':
  Make sure we actually clear the adapter's cursor when finishing.

14 years agoMake sure we actually clear the adapter's cursor when finishing.
Marco Nelissen [Fri, 4 Dec 2009 16:48:06 +0000 (08:48 -0800)]
Make sure we actually clear the adapter's cursor when finishing.