OSDN Git Service
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.
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.
Marco Nelissen [Sun, 13 Dec 2009 20:25:52 +0000 (12:25 -0800)]
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.
Marco Nelissen [Sat, 12 Dec 2009 22:07:59 +0000 (14:07 -0800)]
Fix more 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.
Marco Nelissen [Sat, 12 Dec 2009 21:27:50 +0000 (13:27 -0800)]
Fix build.
Marco Nelissen [Sat, 12 Dec 2009 20:27:11 +0000 (12:27 -0800)]
Music player UI refresh.
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
Eric Fischer [Thu, 10 Dec 2009 01:27:31 +0000 (17:27 -0800)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 9 Dec 2009 17:32:42 +0000 (09:32 -0800)]
Make moving an entry in a playlist a lot faster.
Marco Nelissen [Fri, 4 Dec 2009 17:40:22 +0000 (09:40 -0800)]
Fix monkey crash
Marco Nelissen [Fri, 4 Dec 2009 16:48:06 +0000 (08:48 -0800)]
Make sure we actually clear the adapter's cursor when finishing.
Marco Nelissen [Thu, 3 Dec 2009 22:24:53 +0000 (14:24 -0800)]
Fix a whole bunch of monkey bugs by making sure that the adapter
doesn't hold on to and tries to use a closed cursor.
Eric Fischer [Wed, 2 Dec 2009 23:12:19 +0000 (15:12 -0800)]
am
040283fe: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
040283feb9319a1e4f2b19e62f1196c644a12256' into eclair-mr2
* commit '
040283feb9319a1e4f2b19e62f1196c644a12256':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:57:22 +0000 (14:57 -0800)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 2 Dec 2009 13:24:01 +0000 (05:24 -0800)]
am
3d1a7c04: Make music app respect the lock screen again. Fixes b/
2295956
Merge commit '
3d1a7c04539695d926de58981df20e506c1a89ab' into eclair-mr2
* commit '
3d1a7c04539695d926de58981df20e506c1a89ab':
Make music app respect the lock screen again.
Eric Fischer [Wed, 2 Dec 2009 01:11:58 +0000 (17:11 -0800)]
am
5384566a: (-s ours) Merge change Ia70c1b81 into eclair
Merge commit '
5384566a63c603e5688d016d07b2dcb247a9416d' into eclair-mr2
* commit '
5384566a63c603e5688d016d07b2dcb247a9416d':
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 2 Dec 2009 01:04:43 +0000 (17:04 -0800)]
am
ac868d43: Update hdpi item grabber icon.
Merge commit '
ac868d438363d8505ac886ec5e5c871c18ac448a' into eclair-mr2
* commit '
ac868d438363d8505ac886ec5e5c871c18ac448a':
Update hdpi item grabber icon.
Marco Nelissen [Tue, 1 Dec 2009 23:13:15 +0000 (15:13 -0800)]
Make music app respect the lock screen again.
Fixes http://b/
2295956
Android (Google) Code Review [Mon, 30 Nov 2009 19:57:00 +0000 (11:57 -0800)]
Merge change Ia70c1b81 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:38:20 +0000 (11:38 -0800)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Mon, 30 Nov 2009 17:29:30 +0000 (09:29 -0800)]
Update hdpi item grabber icon.
Marco Nelissen [Thu, 19 Nov 2009 19:41:07 +0000 (11:41 -0800)]
am
d04e2557: Merge change I9e4ded20 into eclair
Merge commit '
d04e2557d23686f506335e3bbe3e55ffbdcba9a4' into eclair-mr2
* commit '
d04e2557d23686f506335e3bbe3e55ffbdcba9a4':
Make headset buttons behave more like the in-app buttons, by seeking
Marco Nelissen [Thu, 19 Nov 2009 19:36:36 +0000 (11:36 -0800)]
Merge commit '
25f9558d' into HEAD
Android (Google) Code Review [Thu, 19 Nov 2009 16:55:44 +0000 (08:55 -0800)]
Merge change I9e4ded20 into eclair
* changes:
Make headset buttons behave more like the in-app buttons, by seeking back to the start of the file when hitting 'previous' in the first few seconds of playback.
Marco Nelissen [Thu, 19 Nov 2009 00:04:19 +0000 (16:04 -0800)]
Make headset buttons behave more like the in-app buttons, by seeking
back to the start of the file when hitting 'previous' in the first few
seconds of playback.
Dianne Hackborn [Thu, 19 Nov 2009 01:01:42 +0000 (17:01 -0800)]
Feature
2179737: allow the "now playing" activity to show without unlocking the phone.
Bring back this change now that the bugs are fixed.
This reverts commit
2f70aeeb516899a276a55432b02d989304e93a08.
Paul Eastham [Sun, 15 Nov 2009 22:53:45 +0000 (14:53 -0800)]
am
2f70aeeb: (-s ours) Revert "Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone." DO NOT MERGE
Merge commit '
2f70aeeb516899a276a55432b02d989304e93a08' into eclair-mr2
* commit '
2f70aeeb516899a276a55432b02d989304e93a08':
Revert "Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone." DO NOT MERGE
Paul Eastham [Sun, 15 Nov 2009 21:27:34 +0000 (13:27 -0800)]
Revert "Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone." DO NOT MERGE
This reverts commit
0657c9efaa7146d5f2ab169ca46c48a22f64e893.
Seems to fix b/
2261008, needed to get MR1 out the door.
Eric Fischer [Sat, 14 Nov 2009 01:53:03 +0000 (17:53 -0800)]
am
4232bd1c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
4232bd1c554b9df3596e9eb977e38b3181ddd8e0' into eclair-mr2
* commit '
4232bd1c554b9df3596e9eb977e38b3181ddd8e0':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:23:26 +0000 (17:23 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Marco Nelissen [Thu, 12 Nov 2009 01:13:05 +0000 (17:13 -0800)]
am
e99341f9: Add some logging to help track down bug
2223013.
Merge commit '
e99341f9674462607f3fd5e8dbd100b34b973e1b' into eclair-mr2
* commit '
e99341f9674462607f3fd5e8dbd100b34b973e1b':
Add some logging to help track down bug
2223013.
Marco Nelissen [Wed, 11 Nov 2009 19:13:51 +0000 (11:13 -0800)]
Add some logging to help track down bug
2223013.
Eric Fischer [Fri, 6 Nov 2009 23:29:16 +0000 (15:29 -0800)]
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Thu, 29 Oct 2009 08:21:52 +0000 (01:21 -0700)]
am
197d7431: Merge change I71a020a9 into eclair
Merge commit '
197d74317c3c44ed1f5ed7f40d769aec93c288f2' into eclair-mr2
* commit '
197d74317c3c44ed1f5ed7f40d769aec93c288f2':
Fixed the flakiness of the music power test.
Mike Cleron [Thu, 29 Oct 2009 08:21:23 +0000 (01:21 -0700)]
am
fac9e042: Oops -- missed this in my last CL
Merge commit '
fac9e0428fc56aa7e71eda6cdc87a3e4e74fe98e' into eclair-mr2
* commit '
fac9e0428fc56aa7e71eda6cdc87a3e4e74fe98e':
Oops -- missed this in my last CL
Mike Cleron [Thu, 29 Oct 2009 08:20:54 +0000 (01:20 -0700)]
Android (Google) Code Review [Tue, 27 Oct 2009 20:49:03 +0000 (16:49 -0400)]
Merge change I71a020a9 into eclair
* changes:
Fixed the flakiness of the music power test.
Mike Cleron [Tue, 27 Oct 2009 20:39:43 +0000 (13:39 -0700)]
Oops -- missed this in my last CL
Mike Cleron [Tue, 27 Oct 2009 06:29:38 +0000 (23:29 -0700)]
New widgets
Yu Shan Emily Lau [Tue, 27 Oct 2009 04:55:38 +0000 (21:55 -0700)]
Fixed the flakiness of the music power test.
Eric Fischer [Thu, 22 Oct 2009 13:47:05 +0000 (06:47 -0700)]
am
f6c42a62: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f6c42a6201a88ecc03f628fa3cef844c461a3f9a' into eclair-mr2
* commit '
f6c42a6201a88ecc03f628fa3cef844c461a3f9a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:46:53 +0000 (10:46 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Marco Nelissen [Tue, 20 Oct 2009 01:04:24 +0000 (18:04 -0700)]
resolved conflicts for merge of
0657c9ef to eclair-mr2
Marco Nelissen [Tue, 20 Oct 2009 00:22:10 +0000 (17:22 -0700)]
Passion feature
2179737: allow the "now playing" activity to show without unlocking the phone.
Android (Google) Code Review [Wed, 14 Oct 2009 15:54:26 +0000 (11:54 -0400)]
Merge change If7b53aba into eclair-mr2
* changes:
Fix monkey bug
2180463.
Eric Fischer [Tue, 13 Oct 2009 23:07:14 +0000 (16:07 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Tue, 13 Oct 2009 21:54:25 +0000 (14:54 -0700)]
Marco Nelissen [Mon, 12 Oct 2009 22:59:52 +0000 (15:59 -0700)]
I had completely forgotten that the alternative seek method in the
music app was actually reachable, but monkey found it, and crashed it.
Fixes bug
2177755.
Marco Nelissen [Mon, 12 Oct 2009 19:29:09 +0000 (12:29 -0700)]
Make sure we actually have an adapter before trying to access it.
Fixes bug
2177763.
Marco Nelissen [Mon, 12 Oct 2009 16:24:12 +0000 (09:24 -0700)]
Fix bug
2167616: create the playlists submenu in onPrepareOptionsMenu instead of onCreateOptionsMenu, so it's always up to date.
Mike Cleron [Fri, 9 Oct 2009 19:37:31 +0000 (12:37 -0700)]
am
6a470f06: Merge change I347fe57e into eclair
Merge commit '
6a470f06a781b99a1656e14879459db110cef078' into eclair-mr2
* commit '
6a470f06a781b99a1656e14879459db110cef078':
1915450: Make the music widget show pause state properly
Android (Google) Code Review [Fri, 9 Oct 2009 19:31:25 +0000 (15:31 -0400)]
Merge change I347fe57e into eclair
* changes:
1915450: Make the music widget show pause state properly
Mike Cleron [Fri, 9 Oct 2009 19:26:28 +0000 (12:26 -0700)]
1915450: Make the music widget show pause state properly
Marco Nelissen [Fri, 9 Oct 2009 17:35:30 +0000 (10:35 -0700)]
Stop view dragging the correct way, so we don't end up recycling an in-use bitmap.
(fixes bug
2176573)
Eric Fischer [Fri, 9 Oct 2009 00:33:19 +0000 (17:33 -0700)]
am
a0c7911a: (-s ours) am
a38ba1d9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9' into eclair-mr2
* commit '
a0c7911afab25ad83cdfec9e1e9ff08e5babd7f9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22: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
Marco Nelissen [Thu, 1 Oct 2009 17:15:41 +0000 (10:15 -0700)]
Make sure that there is nothing referring to the bitmap before recycling it.
Hopefully this will fix bug
2157769.
Mike Cleron [Thu, 1 Oct 2009 01:28:37 +0000 (18:28 -0700)]
Fix widgets
Mike Cleron [Wed, 30 Sep 2009 08:16:15 +0000 (01:16 -0700)]
Newer icons
Eric Fischer [Tue, 29 Sep 2009 23:43:32 +0000 (16:43 -0700)]
Import revised translations. DO NOT MERGE
Mike Cleron [Tue, 29 Sep 2009 07:27:38 +0000 (00:27 -0700)]
New icons
Android (Google) Code Review [Fri, 25 Sep 2009 17:40:01 +0000 (13:40 -0400)]
Merge change 27050 into eclair
* changes:
The new tall screen layout really only works for a subset of tall screens, so make it specific to the exact resolulion that it's meant for.
Marco Nelissen [Fri, 25 Sep 2009 16:23:36 +0000 (09:23 -0700)]
The new tall screen layout really only works for a subset of tall screens,
so make it specific to the exact resolulion that it's meant for.
Android (Google) Code Review [Fri, 25 Sep 2009 15:26:13 +0000 (11:26 -0400)]
Merge change 27014 into eclair
* changes:
Modified the test case name into a more meaningful name.
Yu Shan Emily Lau [Fri, 25 Sep 2009 07:27:32 +0000 (00:27 -0700)]
Modified the test case name into a more meaningful name.
Marco Nelissen [Thu, 24 Sep 2009 20:21:06 +0000 (13:21 -0700)]
onStart() can now receive a null Intent, so deal with that.
Android (Google) Code Review [Thu, 24 Sep 2009 16:59:14 +0000 (12:59 -0400)]
Merge change 26859 into eclair
* changes:
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Marco Nelissen [Wed, 23 Sep 2009 23:38:34 +0000 (16:38 -0700)]
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Android (Google) Code Review [Wed, 23 Sep 2009 20:19:33 +0000 (16:19 -0400)]
Merge change 26657 into eclair
* changes:
Fix title bar in album browser.
Marco Nelissen [Wed, 23 Sep 2009 20:11:06 +0000 (13:11 -0700)]
Fix title bar in album browser.
Daniel Sandler [Wed, 23 Sep 2009 17:49:52 +0000 (13:49 -0400)]
Fix invalid XML in Music list view layout.
Related to http://b/
2139600.
Yu Shan Emily Lau [Mon, 21 Sep 2009 04:26:37 +0000 (21:26 -0700)]
Added the music player do nothing test case to add the basic line.
Eric Fischer [Thu, 17 Sep 2009 21:34:51 +0000 (14:34 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 10 Sep 2009 16:53:41 +0000 (12:53 -0400)]
Merge change 24529 into eclair
* changes:
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Marco Nelissen [Thu, 10 Sep 2009 15:35:36 +0000 (08:35 -0700)]
Use dpad left/right for skipping and seeking only when the play buttons are focused.
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.
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.
Nick Pelly [Wed, 9 Sep 2009 00:50:45 +0000 (17:50 -0700)]
Update application for Bluetooth API change: deprecation of BluetoothError.
Eric Fischer [Tue, 8 Sep 2009 23:29:54 +0000 (16:29 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 2 Sep 2009 20:00:49 +0000 (13:00 -0700)]
Don't crash when long-pressing on a stream.
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.
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.
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.
Yu Shan Emily Lau [Fri, 28 Aug 2009 17:44:14 +0000 (10:44 -0700)]
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.
new file: tests/src/com/android/music/MusicPlayerStability.java
new file: tests/src/com/android/music/MusicPlayerStability.java
new file: src/com/android/music/MusicPlayerStability.java
new file: src/com/android/music/MusicPlayerStability.java
Daniel Sandler [Fri, 28 Aug 2009 18:51:56 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Music.
Eric Fischer [Fri, 28 Aug 2009 00:25:49 +0000 (17:25 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: If5df4769880a03545894a77c578298370eeeb18e
Daniel Sandler [Thu, 20 Aug 2009 18:17:53 +0000 (14:17 -0400)]
Cosmetic: contract the music player's seekbar by a few pixels to give the thumb some breathing room. (Related to b/
2064664)
Marco Nelissen [Wed, 19 Aug 2009 17:21:29 +0000 (10:21 -0700)]
Fix density issue with album art.
Dianne Hackborn [Tue, 18 Aug 2009 18:35:30 +0000 (11:35 -0700)]
Change to use new service foreground API.
Eric Fischer [Tue, 18 Aug 2009 18:00:54 +0000 (11:00 -0700)]
am
5d9c780e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5d9c780e7d44e39caa48dc06df7ba76e1386b246' into eclair
* commit '
5d9c780e7d44e39caa48dc06df7ba76e1386b246':
Import revised translations. DO NOT MERGE
Marco Nelissen [Mon, 17 Aug 2009 21:17:27 +0000 (14:17 -0700)]
Also save the history in shuffle mode.
Another partial fix for http://b/issue?id=
2033192, this one
gets us most of the way there. Might even be good enough
for Eclair.
Eric Fischer [Mon, 17 Aug 2009 20:15:31 +0000 (13:15 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Mon, 17 Aug 2009 15:52:29 +0000 (08:52 -0700)]
Increase the history size. It should never have been this small.
Partial fix for http://b/issue?id=
2033192
Marco Nelissen [Fri, 14 Aug 2009 17:06:15 +0000 (10:06 -0700)]
Make search work in all activities in the music app, enable the
music app itself as a media search provider, and fix some issues
surrounding searching items that have unknown artist or album.
Marco Nelissen [Fri, 14 Aug 2009 01:43:49 +0000 (18:43 -0700)]
am
e03cc0f3: Merge change 21112 into donut
Merge commit '
e03cc0f3aa2eb5b1e3b2f726f20e246ac56a8c87' into eclair
* commit '
e03cc0f3aa2eb5b1e3b2f726f20e246ac56a8c87':
Fix memory leaks in music app.
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 05:55:58 +0000 (22:55 -0700)]
resolved conflicts for merge of
7790a210 to master