OSDN Git Service
Chih-Wei Huang [Wed, 3 Feb 2010 07:07:09 +0000 (15:07 +0800)]
add notouch resources to avoid crash
Chih-Wei Huang [Thu, 20 Aug 2009 10:03:55 +0000 (18:03 +0800)]
enable video player
Kenny Root [Mon, 17 May 2010 18:37:35 +0000 (11:37 -0700)]
Import revised translations
Change-Id: If36943649f75ad82c1290525c3899a86dca6fdab
Marco Nelissen [Tue, 11 May 2010 17:02:22 +0000 (10:02 -0700)]
Remove the calls to (un)registerAudioFocusListener that are about
to be hidden.
Bugs
2670395 and
2599698
Change-Id: Ia2415e90dcdbce5848d32e752361d12d15fe0057
Andreas Huber [Tue, 4 May 2010 19:04:26 +0000 (12:04 -0700)]
Support ogg vorbis through the StreamStarter in Music app.
Change-Id: I90bdc7495d691b3df8bb10600f7aea48c278bb12
related-to-bug:
2654400
Kenny Root [Thu, 29 Apr 2010 22:43:51 +0000 (15:43 -0700)]
Import revised translations
Change-Id: If04c3d713ce2fefa81cf82a649332c8b8f360b1a
Kenny Root [Tue, 27 Apr 2010 20:58:43 +0000 (13:58 -0700)]
Import revised translations
Change-Id: I54c44e165163bf060893d5e08f1b7d499f83a6be
Daniel Sandler [Fri, 23 Apr 2010 14:01:52 +0000 (10:01 -0400)]
More informative initial string for Music widget.
On first launch, the Music widget now shows
"Touch to select music."
instead of
"Selected playlist is empty."
Required for Froyo out-of-box-experience.
Bug:
2559083
Change-Id: Id9d300413de5dcd6ed619972de24cfe653c75c91
Jean-Michel Trivi [Wed, 21 Apr 2010 00:00:26 +0000 (17:00 -0700)]
Update the Music app to fully use AudioFocus to implement its logic
for pausing and resuming for phone rings and calls.
The Music app does no longer need to implement PhoneStateListener.
Change-Id: I9435969ec2ac7f755390136c3b689ec519742fa6
Kenny Root [Thu, 15 Apr 2010 03:33:26 +0000 (20:33 -0700)]
Import revised translations
Change-Id: I76fed8f7a27fc286059b4471419a97da29e7a8b8
Marco Nelissen [Tue, 13 Apr 2010 17:07:54 +0000 (10:07 -0700)]
Fix issue with multiple copies of the main music screen.
(bug
2524477)
Change-Id: If79798dcd8ceb8eb9d823a8f613e23261022ca65
Marco Nelissen [Mon, 12 Apr 2010 21:48:19 +0000 (14:48 -0700)]
Fix Droid layout issue (bug
2572289).
Change-Id: I2c752d8013ea39a82121a867d39cd1c191ca258b
Marco Nelissen [Wed, 7 Apr 2010 00:29:07 +0000 (17:29 -0700)]
Pause requests that come in while a phone call is in progress should override
the auto resume behavior. This makes it so that music playback will not auto
resume after undocking or unplugging to answer a call (because we get pause
requests for those, because they are routing changes).
Fixes bug
2474691.
Change-Id: I583b614c6c394064bc8b625e673781e33c931fb9
Marco Nelissen [Tue, 6 Apr 2010 23:24:24 +0000 (16:24 -0700)]
Fix music app search (bug
2567956)
Change-Id: Ib2d5c284aa5239512733cbb5b7cf9ae35bf881d4
Gloria Wang [Thu, 1 Apr 2010 18:10:58 +0000 (11:10 -0700)]
Fix for NullPointerException (bug
2556291).
Change-Id: I6399ca46f7cd0513d62d7bbb0a9446270ee6762d
Jean-Michel Trivi [Wed, 31 Mar 2010 19:12:23 +0000 (12:12 -0700)]
Fix bug
2553575 API REVIEW: android.media Change 2 of 3
Notes from API Council review:
Rename onAudioFocusChanged -> onAudioFocusChange
Change-Id: Ib55c4296fbfbe92f8ed3b8ffe0a505ddea7daf82
Jean-Michel Trivi [Wed, 17 Mar 2010 18:46:58 +0000 (11:46 -0700)]
Update the Music app to use the remote control focus API.
Request media button events whenever the user has started the
playback of audio content.
Change-Id: I61cb54b2f9b0c9ad3a0728f4110f37497026b27c
Jean-Michel Trivi [Sat, 20 Mar 2010 00:41:49 +0000 (17:41 -0700)]
Update music service to also handle AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK
focus losses. Here they are handled just like regular transient
losses.
Change-Id: Ife2c78636ae3f83297b06e8d3aa60d7724e026ae
Marco Nelissen [Fri, 19 Mar 2010 20:00:37 +0000 (13:00 -0700)]
Fix issue with repeatedly selecting the music notification.
Change-Id: Id0807b72ac09e28264074f82867b817c610f912b
Kenny Root [Thu, 18 Mar 2010 05:14:33 +0000 (22:14 -0700)]
Import revised translations
Change-Id: Ie7eeb5290ca979d1c3b212b60baaade5e9216daf
Jean-Michel Trivi [Tue, 9 Mar 2010 01:06:18 +0000 (17:06 -0800)]
Update the Music player application to register itself as an
AudioFocus user:
- starting playback causes it to request audio focus.
- loss of focus will cause the app to pause
- transient loss of focus will cause the app to pause and resume
when focus is regained.
Change-Id: Ic33de141700c9cd0a5ad2fb69053caa981a0d68f
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:05:05 +0000 (18:05 -0800)]
Add an empty CleanSpec.mk
Change-Id: I25153e9e4e778e4819798823c449e7cf7ddbfe00
Marco Nelissen [Fri, 5 Mar 2010 20:45:23 +0000 (12:45 -0800)]
Integrate from Music2
Eric Fischer [Thu, 4 Mar 2010 22:05:25 +0000 (14:05 -0800)]
Import new translations
Marco Nelissen [Wed, 3 Mar 2010 00:55:25 +0000 (16:55 -0800)]
Print more useful info.
Marco Nelissen [Wed, 3 Mar 2010 00:22:01 +0000 (16:22 -0800)]
Add search hint
Marco Nelissen [Tue, 2 Mar 2010 18:27:05 +0000 (10:27 -0800)]
Add internal logging and 'dumpsys' capability to the music app,
to help track down a few puzzling bugs.
Use 'adb shell dumpsys activity service' to see the current state and log.
Yu Shan Emily Lau [Tue, 2 Mar 2010 04:02:07 +0000 (20:02 -0800)]
Fix the instrumentation test and the package name of the music player is changed.
Eric Fischer [Sat, 27 Feb 2010 01:31:52 +0000 (17:31 -0800)]
Import new translations.
Daniel Sandler [Thu, 18 Feb 2010 20:11:34 +0000 (15:11 -0500)]
Support new MUSIC_PLAYER action intent.
Marco Nelissen [Fri, 12 Feb 2010 23:07:38 +0000 (15:07 -0800)]
Fix NPE in Music
Marco Nelissen [Fri, 12 Feb 2010 22:43:25 +0000 (14:43 -0800)]
Clear the drop/remove listeners when the activity is destroyed, so
we can't get any callbacks anymore.
Marco Nelissen [Fri, 12 Feb 2010 22:00:06 +0000 (14:00 -0800)]
Don't hardcode package names.
Marco Nelissen [Fri, 12 Feb 2010 21:35:36 +0000 (13:35 -0800)]
Don't hardcode package name.
Marco Nelissen [Fri, 12 Feb 2010 17:46:07 +0000 (09:46 -0800)]
Disable the 'save' button if the specified playlist name is blank.
Marco Nelissen [Fri, 12 Feb 2010 01:49:53 +0000 (17:49 -0800)]
Fix monkey crash (bug
2292447)
Marco Nelissen [Fri, 12 Feb 2010 00:04:53 +0000 (16:04 -0800)]
Clear the cached service object when we get disconnected, which will
hopefully fix bug
2437115.
Jeff Hamilton [Thu, 11 Feb 2010 22:25:51 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.
Change-Id: I92c24d5e6cfa7c77ab91a6f004272d7d8ddbbb94
Eugene Koh [Tue, 9 Feb 2010 20:16:10 +0000 (12:16 -0800)]
Merge "Update the mdpi resources with 2.0 style icons"
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)"
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)
Bai Tao [Mon, 8 Feb 2010 07:15:38 +0000 (15:15 +0800)]
Update the mdpi resources with 2.0 style icons
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
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
The Android Open Source Project [Fri, 5 Feb 2010 16:09:40 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
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)
The Android Open Source Project [Fri, 29 Jan 2010 22:09:26 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
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.
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.
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.
Marco Nelissen [Tue, 26 Jan 2010 18:21:13 +0000 (10:21 -0800)]
Merge optimization back from Music2
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
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.
The Android Open Source Project [Tue, 12 Jan 2010 23:19:15 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Marco Nelissen [Tue, 12 Jan 2010 21:58:12 +0000 (13:58 -0800)]
b/
2343548
Fix the "recently added" spinner.
Marco Nelissen [Tue, 12 Jan 2010 18:58:58 +0000 (10:58 -0800)]
Fix package ref in layout. (b/
2363099)
Marco Nelissen [Mon, 11 Jan 2010 21:12:22 +0000 (13:12 -0800)]
Add missing mdpi resources (b/
2353729)
Romain Guy [Fri, 8 Jan 2010 23:07:04 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Eric Fischer [Fri, 8 Jan 2010 18:04:10 +0000 (10:04 -0800)]
Merge "Update with latest translations."
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)
Eric Fischer [Thu, 7 Jan 2010 23:58:53 +0000 (15:58 -0800)]
Update with latest translations.
Marco Nelissen [Wed, 6 Jan 2010 22:03:59 +0000 (14:03 -0800)]
Clean up imports.
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.
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
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.
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.
Marco Nelissen [Tue, 5 Jan 2010 00:55:00 +0000 (16:55 -0800)]
Use shiny new MatrixCursor instead of dull old ArrayListCursor.
Marco Nelissen [Mon, 4 Jan 2010 23:31:21 +0000 (15:31 -0800)]
Don't use mContext directly, since that prevents unbundling.
Marco Nelissen [Mon, 4 Jan 2010 23:01:18 +0000 (15:01 -0800)]
MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING
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
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
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.
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.
Marco Nelissen [Wed, 16 Dec 2009 18:56:17 +0000 (10:56 -0800)]
Checkout for currently unused fling mode.
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.
Marco Nelissen [Tue, 15 Dec 2009 23:05:43 +0000 (15:05 -0800)]
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.
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.
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.
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.
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.
Android (Google) Code Review [Tue, 15 Dec 2009 17:53:18 +0000 (09:53 -0800)]
Merge change Iac35b994 into eclair
* changes:
Fix tab widths.
Marco Nelissen [Tue, 15 Dec 2009 17:39:07 +0000 (09:39 -0800)]
Fix tab widths.
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.
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.
Android Git Automerger [Tue, 15 Dec 2009 08:45:06 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
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.
Marco Nelissen [Mon, 14 Dec 2009 23:59:30 +0000 (15:59 -0800)]
Fix scroll position of album songs list.
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.
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.
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.
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.
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.
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
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.
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.
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.
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.
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
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.