OSDN Git Service
Chih-Wei Huang [Thu, 20 Aug 2009 10:03:55 +0000 (18:03 +0800)]
enable video player
Yi_Sun [Wed, 8 Jul 2009 20:20:06 +0000 (13:20 -0700)]
add new resource for notouch to avoid crash on x86 platforms
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:14 +0000 (14:13 -0700)]
merge from donut
Eric Fischer [Mon, 17 Aug 2009 20:15:31 +0000 (13:15 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 13 Aug 2009 18:20:39 +0000 (11:20 -0700)]
Merge change 21112 into donut
* changes:
Fix memory leaks in music app. Fixes http://b/issue?id=
2046569
Marco Nelissen [Thu, 13 Aug 2009 16:58:43 +0000 (09:58 -0700)]
Fix memory leaks in music app.
Fixes http://b/issue?id=
2046569
Jeff Sharkey [Fri, 7 Aug 2009 04:41:42 +0000 (21:41 -0700)]
Adopt new AppWidget assets, per http://b/
2038594.
Eric Fischer [Mon, 3 Aug 2009 23:12:09 +0000 (16:12 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:06 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 03:57:11 +0000 (20:57 -0700)]
Merge korg/donut into korg/master
Conflicts:
res/values/strings.xml
src/com/android/music/MediaPlaybackService.java
Eric Fischer [Mon, 13 Jul 2009 22:49:00 +0000 (15:49 -0700)]
Import new translations
Mike LeBeau [Wed, 1 Jul 2009 01:38:09 +0000 (18:38 -0700)]
Add new searchSettingsDescription attribute for Music's searchable.
This will be shown under the individual searchable item in system search settings.
Satish Sampath [Tue, 30 Jun 2009 17:26:13 +0000 (18:26 +0100)]
Include Music app in Global search.
GlobalSearch does not have it's own music provider anymore so enable the
Music app to show suggestions in global search.
Related bug - http://b/issue?id=
1819601
Marco Nelissen [Fri, 26 Jun 2009 21:23:31 +0000 (14:23 -0700)]
When checking the current playback position against the length
of the file, make sure the length is valid. Otherwise we can
end up endlessly (recursively) calling next(), and run out of
stack.
Eric Fischer [Wed, 17 Jun 2009 23:34:12 +0000 (16:34 -0700)]
Don't let untranslated "<unknown>" or "null" be displayed in Music.
Finally checking in an old fix (for bug
1785503 and bug
1785492)
that got bumped from Cupcake.
Marco Nelissen [Mon, 15 Jun 2009 17:50:42 +0000 (10:50 -0700)]
Fix crash in music app.
Marco Nelissen [Fri, 12 Jun 2009 20:39:27 +0000 (13:39 -0700)]
Fix crash in music app. Monkey found it, but it's easy to repro by a human too.
Eric Fischer [Wed, 10 Jun 2009 22:11:47 +0000 (15:11 -0700)]
Update Portuguese translations.
Android (Google) Code Review [Wed, 10 Jun 2009 19:45:04 +0000 (12:45 -0700)]
Merge change 3753 into donut
* changes:
Fix NPE in music app.
Marco Nelissen [Wed, 10 Jun 2009 19:43:25 +0000 (12:43 -0700)]
Fix NPE in music app.
Eric Fischer [Wed, 10 Jun 2009 19:31:38 +0000 (12:31 -0700)]
am
f6a28267: AI 149721: Import Portuguese translations.
Merge commit '
f6a28267503f50548169666009ff3605d82c9e67' into donut
* commit '
f6a28267503f50548169666009ff3605d82c9e67':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:26:09 +0000 (12:26 -0700)]
AI 149721: Import Portuguese translations.
Automated import of CL 149721
Marco Nelissen [Tue, 9 Jun 2009 19:56:55 +0000 (12:56 -0700)]
Add write-to-sd-card permission to music app
Marco Nelissen [Fri, 5 Jun 2009 19:46:09 +0000 (12:46 -0700)]
Shave about 1500 milliseconds off the time it takes to restore a large playlist,
with corresponding reduction in music playback service startup time.
Ravi K Yenduri [Sat, 30 May 2009 03:34:25 +0000 (22:34 -0500)]
Fix for a hang when attempting to stream a non-existing content.
-- StreamStarter Activity is binding the the MediaPlaybackService. As part of this, it is registering for the intent "ASYNC_OPEN_COMPLETE".
-- In the normal scenario, after prepareAsync completes, the OnPreparedListener is fired. This ends up broadcasting the "ASYNC_OPEN_COMPLETE" intent.
-- Since the StreamStarter Activity has registered for the intent, it will receive the even on it's listener, "onReceive". Here, the MediaPlaybackService
"play" is called which starts the actual playback. And, the PLAYBACK_VIEWER intent is sent. This starts the MediaPlaybackActivity. And, "finish" is
called in the StreamStarter Activity that will kill the activity. From this point, the MediaPlayback Activity takes over (this activity is the screen
where you see the progress bar, and the metadata stuff).
-- Now, in this scenario, there is a failure in the "prepareAsync" command. Because of this the ASYNC_OPEN_COMPLETE intent is never broadcasted, and
hence the StreamStarterActivity never finishes.
- Proposed solution:
-- Register the StreamStarter Activity to another intent (PLAYBACK_COMPLETE).
-- In OnReceive call, add a condition that when the received intent is PLAYBACK_COMPLETE, "finish" the activity.
needs to be broadcasted only if this is a single attempt playback, i.e., if "mOneShot" is "true".
Ravi K Yenduri [Sat, 30 May 2009 03:34:25 +0000 (22:34 -0500)]
Fix for a hang when attempting to stream a non-existing content.
-- StreamStarter Activity is binding the the MediaPlaybackService. As part of this, it is registering for the intent "ASYNC_OPEN_COMPLETE".
-- In the normal scenario, after prepareAsync completes, the OnPreparedListener is fired. This ends up broadcasting the "ASYNC_OPEN_COMPLETE" intent.
-- Since the StreamStarter Activity has registered for the intent, it will receive the even on it's listener, "onReceive". Here, the MediaPlaybackService
"play" is called which starts the actual playback. And, the PLAYBACK_VIEWER intent is sent. This starts the MediaPlaybackActivity. And, "finish" is
called in the StreamStarter Activity that will kill the activity. From this point, the MediaPlayback Activity takes over (this activity is the screen
where you see the progress bar, and the metadata stuff).
-- Now, in this scenario, there is a failure in the "prepareAsync" command. Because of this the ASYNC_OPEN_COMPLETE intent is never broadcasted, and
hence the StreamStarterActivity never finishes.
- Proposed solution:
-- Register the StreamStarter Activity to another intent (PLAYBACK_COMPLETE).
-- In OnReceive call, add a condition that when the received intent is PLAYBACK_COMPLETE, "finish" the activity.
needs to be broadcasted only if this is a single attempt playback, i.e., if "mOneShot" is "true".
Marco Nelissen [Wed, 3 Jun 2009 23:09:18 +0000 (16:09 -0700)]
Replace usage of deprecated PhoneStateIntentReceiver with PhoneStateListener.
Thomas Tuttle [Thu, 29 Jan 2009 02:06:46 +0000 (21:06 -0500)]
Make play() call next() if we are at end of track (and not REPEAT_CURRENT).
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 3 Jun 2009 00:26:44 +0000 (17:26 -0700)]
Use event time to detect long press in MediaButtonIntentReceiver.
This should help avoid false positives in the Party Shuffle feature
when the system is very slow.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Marco Nelissen [Thu, 28 May 2009 17:20:02 +0000 (10:20 -0700)]
Clean up some handlers when the service is destroyed. This should fix some more of the monkey bugs in the music app.
Marco Nelissen [Wed, 27 May 2009 19:57:06 +0000 (12:57 -0700)]
This should fix a monkey bug where the service was being used after it was unbound.
Daisuke Miyakawa [Mon, 25 May 2009 07:32:08 +0000 (16:32 +0900)]
Merge from cupcake_dcm. Should be reviewed by jackpal.
Internal issue:
1753548. CL#144715
Android (Google) Code Review [Fri, 22 May 2009 19:10:37 +0000 (12:10 -0700)]
Merge change 2339 into donut
* changes:
We're not displaying the album name anymore in the 'songs' list, so it's a little strange to filter on it.
Marco Nelissen [Fri, 22 May 2009 19:01:25 +0000 (12:01 -0700)]
We're not displaying the album name anymore in the 'songs' list, so it's a little strange to filter on it.
Android (Google) Code Review [Fri, 22 May 2009 16:59:08 +0000 (09:59 -0700)]
Merge change 1923 into donut
* changes:
Fix crash in MusicPicker activity
Marco Nelissen [Thu, 21 May 2009 23:26:47 +0000 (16:26 -0700)]
Decouple the service interface stub from the service, so that the
service can be GCd even if the system process still holds a reference
to the stub.
Marco Nelissen [Mon, 18 May 2009 23:35:44 +0000 (16:35 -0700)]
Fix crash in MusicPicker activity
Marco Nelissen [Thu, 14 May 2009 17:07:23 +0000 (10:07 -0700)]
Findbugs fixes. Mostly performance related (remove unnecessary code, make inner classes static)
Marco Nelissen [Wed, 13 May 2009 22:31:23 +0000 (15:31 -0700)]
Don't show menu in oneshot mode, since it's not useful and may confuse other parts of the code.
Marco Nelissen [Mon, 11 May 2009 19:43:13 +0000 (12:43 -0700)]
Remove unused code.
Marco Nelissen [Mon, 11 May 2009 17:28:31 +0000 (10:28 -0700)]
Fix comment.
Marco Nelissen [Mon, 11 May 2009 16:56:31 +0000 (09:56 -0700)]
Looks like something got lost during a previous commit, upload or submit.
Android (Google) Code Review [Thu, 7 May 2009 22:00:45 +0000 (15:00 -0700)]
Merge change 1102 into donut
* changes:
Make it so that isPlaying() returns whether the service is playing, even when its MediaPlayer currently isn't, like when it is transitioning between tracks.
Marco Nelissen [Wed, 6 May 2009 19:54:47 +0000 (12:54 -0700)]
Make it so that isPlaying() returns whether the service is playing, even
when its MediaPlayer currently isn't, like when it is transitioning
between tracks.
Marco Nelissen [Wed, 6 May 2009 21:57:37 +0000 (14:57 -0700)]
When doing a youtube/amazon/browser search from the music app, make it a new task.
Marco Nelissen [Tue, 5 May 2009 22:57:19 +0000 (15:57 -0700)]
Postpone doing actual work in QueryBrowserActivity until it's bound to the playback service.
Marco Nelissen [Tue, 5 May 2009 21:36:25 +0000 (14:36 -0700)]
Rename some methods to confirm to our naming standards.
Make it so that when a content-uri is passed in a VIEW intent, it doesn't play in one-shot mode,
but can play in the background as if it was started from the music app itself.
Android (Google) Code Review [Fri, 1 May 2009 16:41:56 +0000 (09:41 -0700)]
Merge change 880 into donut
* changes:
Switch Music app to use the new 'fancy' search uri internally, and the 'basic' search uri for system search, instead of using the less efficient legacy uri for both.
Marco Nelissen [Fri, 1 May 2009 16:06:07 +0000 (09:06 -0700)]
Switch Music app to use the new 'fancy' search uri internally, and the 'basic' search uri
for system search, instead of using the less efficient legacy uri for both.
Eric Fischer [Fri, 1 May 2009 00:57:10 +0000 (17:57 -0700)]
am
3134634: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
31346348b8eea2e0bab6b7d17ff675a6ab02859f' into donut
* commit '
31346348b8eea2e0bab6b7d17ff675a6ab02859f':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
Eric Fischer [Wed, 29 Apr 2009 04:57:30 +0000 (21:57 -0700)]
am
bd510b5: AI 147962: Import updated zh_TW translations.
Merge commit '
bd510b5e4bc22852ca367804d6825c8815aeded8' into donut
* commit '
bd510b5e4bc22852ca367804d6825c8815aeded8':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:40 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
The Android Open Source Project [Fri, 24 Apr 2009 20:55:02 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Eric Fischer [Wed, 22 Apr 2009 19:33:56 +0000 (12:33 -0700)]
AI 147406: Import revised translations.
Automated import of CL 147406
The Android Open Source Project [Wed, 15 Apr 2009 01:18:15 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'
Eric Fischer [Tue, 14 Apr 2009 19:10:43 +0000 (12:10 -0700)]
AI 146175: Import updated translations.
Automated import of CL 146175
Eric Fischer [Tue, 14 Apr 2009 00:16:19 +0000 (17:16 -0700)]
AI 146037: Import updated translations.
Automated import of CL 146037
Andreas Huber [Mon, 13 Apr 2009 23:15:57 +0000 (16:15 -0700)]
Fix null pointer exception if song has neither artist nor album information.
For songs that we couldn't determine any information on artist and album for we used
to crash with a null pointer exception, since in this particular case (audio file
attachment received via email and opened using music app, not even song title
information was available we would have ended up showing a popup
"Search for null/'' using ..." which I consider unhelpful and futile enough
to just disable this case altogether.
(bug
1785479)
Andy Stadler [Fri, 10 Apr 2009 23:24:49 +0000 (16:24 -0700)]
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Dianne Hackborn [Thu, 9 Apr 2009 19:31:17 +0000 (12:31 -0700)]
AI 145382: API review: change new media keycode names to avoid ambiguity.
Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match.
BUG=
1779435
Automated import of CL 145382
Eric Fischer [Thu, 9 Apr 2009 01:43:30 +0000 (18:43 -0700)]
AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
Eric Fischer [Wed, 8 Apr 2009 01:15:15 +0000 (18:15 -0700)]
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
Eric Fischer [Fri, 3 Apr 2009 04:42:06 +0000 (21:42 -0700)]
AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
Roll back US Spanish import because it made the build too big.
*** Original change description ***
Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144355
Eric Fischer [Thu, 2 Apr 2009 23:42:16 +0000 (16:42 -0700)]
AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144336
Eric Fischer [Thu, 2 Apr 2009 23:39:23 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
Jeffrey Sharkey [Tue, 31 Mar 2009 21:41:09 +0000 (14:41 -0700)]
AI 143777: am: CL 143623 Show music widget error text in smaller artist font.
This fixes bug where "Selected playlist is..." text was unhelpful to users.
Original author: jsharkey
Merged from: //branches/cupcake/...
Automated import of CL 143777
Jeffrey Sharkey [Tue, 31 Mar 2009 17:13:15 +0000 (10:13 -0700)]
AI 143623: Show music widget error text in smaller artist font.
This fixes bug where "Selected playlist is..." text was unhelpful to users.
BUG=
1747567
Automated import of CL 143623
Dianne Hackborn [Sat, 28 Mar 2009 01:26:13 +0000 (18:26 -0700)]
AI 143214: am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Automated import of CL 143214
The Android Open Source Project [Fri, 27 Mar 2009 22:31:12 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Dianne Hackborn [Thu, 26 Mar 2009 23:28:26 +0000 (16:28 -0700)]
Automated import from //branches/cupcake/...@143009,143009
Jack Palevich [Thu, 26 Mar 2009 00:51:16 +0000 (17:51 -0700)]
Automated import from //branches/donutburger/...@142797,142797
Jeffrey Sharkey [Thu, 26 Mar 2009 00:07:33 +0000 (17:07 -0700)]
Automated import from //branches/donutburger/...@142721,142721
Eric Fischer [Thu, 26 Mar 2009 00:04:29 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720
Jack Palevich [Wed, 25 Mar 2009 23:39:34 +0000 (16:39 -0700)]
Automated import from //branches/cupcake/...@142796,142796
Jeffrey Sharkey [Wed, 25 Mar 2009 22:23:55 +0000 (15:23 -0700)]
Automated import from //branches/cupcake/...@142649,142649
Eric Fischer [Wed, 25 Mar 2009 22:22:44 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643
Jeffrey Sharkey [Wed, 25 Mar 2009 04:27:02 +0000 (21:27 -0700)]
Automated import from //branches/donutburger/...@142100,142100
Dave Sparks [Wed, 25 Mar 2009 04:19:05 +0000 (21:19 -0700)]
Automated import from //branches/donutburger/...@142023,142023
Eric Fischer [Wed, 25 Mar 2009 04:02:50 +0000 (21:02 -0700)]
Automated import from //branches/donutburger/...@141868,141868
Jeffrey Sharkey [Wed, 25 Mar 2009 02:18:31 +0000 (19:18 -0700)]
Automated import from //branches/donutburger/...@141032,141032
Jeffrey Sharkey [Wed, 25 Mar 2009 01:59:49 +0000 (18:59 -0700)]
Automated import from //branches/cupcake/...@142098,142098
Dave Sparks [Wed, 25 Mar 2009 01:50:00 +0000 (18:50 -0700)]
Automated import from //branches/cupcake/...@142021,142021
Eric Fischer [Wed, 25 Mar 2009 01:47:01 +0000 (18:47 -0700)]
Automated import from //branches/donutburger/...@140873,140873
Eric Fischer [Wed, 25 Mar 2009 01:33:42 +0000 (18:33 -0700)]
Automated import from //branches/cupcake/...@141866,141866
Romain Guy [Wed, 25 Mar 2009 01:08:41 +0000 (18:08 -0700)]
Automated import from //branches/donutburger/...@140648,140648
Jeffrey Sharkey [Wed, 25 Mar 2009 00:59:05 +0000 (17:59 -0700)]
Automated import from //branches/donutburger/...@140588,140588
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:48 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:48 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Wed, 11 Mar 2009 19:11:59 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Mon, 9 Mar 2009 18:52:14 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Wed, 4 Mar 2009 03:32:30 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:51 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:33 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:42 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
Android Code Review [Tue, 24 Feb 2009 18:05:42 +0000 (10:05 -0800)]
Merge
The Android Open Source Project [Fri, 20 Feb 2009 15:38:33 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:36 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276