OSDN Git Service
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
Jeff Sharkey [Fri, 7 Aug 2009 04:41:42 +0000 (21:41 -0700)]
Adopt new AppWidget assets, per http://b/
2038594.
Android (Google) Code Review [Tue, 4 Aug 2009 20:03:27 +0000 (13:03 -0700)]
Merge change 9669
* changes:
Take density in to account when reordering playlist items.
Marco Nelissen [Tue, 4 Aug 2009 17:21:22 +0000 (10:21 -0700)]
Take density in to account when reordering playlist items.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:29 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Mon, 3 Aug 2009 23:57:21 +0000 (16:57 -0700)]
am
a1f26414: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a1f264140f1529000a6bca0e02bc455fd4d67ee2'
* commit '
a1f264140f1529000a6bca0e02bc455fd4d67ee2':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:12:09 +0000 (16:12 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Thu, 30 Jul 2009 17:40:49 +0000 (10:40 -0700)]
Make TrackBrowserActivity do a limited query first, to get the list view
showing as fast as possible, and then do the full query after that.
This makes going to the list of songs feel much faster.
Marco Nelissen [Thu, 30 Jul 2009 15:28:49 +0000 (08:28 -0700)]
Clean up TrackBrowserActivity. This doesn't change any functionality,
but will make it easier to start making use of query-limits.
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:06 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
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
Android (Google) Code Review [Tue, 21 Jul 2009 22:42:08 +0000 (15:42 -0700)]
Merge change 8097
* changes:
Fix the music app's repeating button.
Marco Nelissen [Tue, 21 Jul 2009 22:40:06 +0000 (15:40 -0700)]
Fix the music app's repeating button.
Marco Nelissen [Tue, 21 Jul 2009 22:12:16 +0000 (15:12 -0700)]
Fix various places where the music app was using 'px' instead of 'dip'.
Marco Nelissen [Wed, 15 Jul 2009 22:04:36 +0000 (15:04 -0700)]
Don't show the 'search' context menu for recordings.
Jean-Baptiste Queru [Wed, 15 Jul 2009 01:05:40 +0000 (18:05 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
* commit 'goog/readonly-korg-master':
Fix for a hang when attempting to stream a non-existing content.
Conflicts:
res/values/strings.xml
Eric Fischer [Mon, 13 Jul 2009 23:59:30 +0000 (16:59 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:49:00 +0000 (15:49 -0700)]
Import new translations
Mike LeBeau [Thu, 2 Jul 2009 22:23:21 +0000 (15:23 -0700)]
am
0f4e0651: Add new searchSettingsDescription attribute for Music\'s searchable. This will be shown under the individual searchable item in system search settings.
Merge commit '
0f4e0651e33bef8953f50082562de0ced41a8542'
* commit '
0f4e0651e33bef8953f50082562de0ced41a8542':
Add new searchSettingsDescription attribute for Music's searchable.
Satish Sampath [Thu, 2 Jul 2009 05:44:18 +0000 (22:44 -0700)]
am
fcdb7609: Include Music app in Global search.
Merge commit '
fcdb7609887efb0a745fc027e1be0c558218e237'
* commit '
fcdb7609887efb0a745fc027e1be0c558218e237':
Include Music app in Global search.
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.
Marco Nelissen [Mon, 29 Jun 2009 21:52:05 +0000 (14:52 -0700)]
Use longs instead of ints for database ids.
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 [Tue, 30 Jun 2009 03:17:31 +0000 (20:17 -0700)]
am
2f9a1ce2: 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.
Merge commit '
2f9a1ce2f3b0ae72d698c240ce8448bc7cfe3a77'
* commit '
2f9a1ce2f3b0ae72d698c240ce8448bc7cfe3a77':
When checking the current playback position against the length
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.
Android (Google) Code Review [Mon, 22 Jun 2009 21:32:58 +0000 (14:32 -0700)]
Merge change 4751
* changes:
Remove code for getting and saving album art from the music app and use the media provider instead.
Marco Nelissen [Mon, 22 Jun 2009 20:42:23 +0000 (13:42 -0700)]
Remove unused resources from Music app.
Marco Nelissen [Tue, 16 Jun 2009 15:54:17 +0000 (08:54 -0700)]
Remove code for getting and saving album art from the music app and
use the media provider instead.
Eric Fischer [Thu, 18 Jun 2009 17:00:17 +0000 (10:00 -0700)]
am
c8aa837a: Don\'t let untranslated "<unknown>" or "null" be displayed in Music.
Merge commit '
c8aa837a48287ad94ee0dcacb525b420a908a06d'
* commit '
c8aa837a48287ad94ee0dcacb525b420a908a06d':
Don't let untranslated "<unknown>" or "null" be displayed in Music.
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 18:39:30 +0000 (11:39 -0700)]
Marco Nelissen [Mon, 15 Jun 2009 17:50:42 +0000 (10:50 -0700)]
Fix crash in music app.
Marco Nelissen [Mon, 15 Jun 2009 04:12:50 +0000 (21:12 -0700)]
am
663fea34: Fix crash in music app. Monkey found it, but it\'s easy to repro by a human too.
Merge commit '
663fea34b586fbdf46acebdb86e163aca0e50323'
* commit '
663fea34b586fbdf46acebdb86e163aca0e50323':
Fix crash in music app. Monkey found it, but it's easy to repro by a human too.
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:33:52 +0000 (15:33 -0700)]
am
cd724d28: Update Portuguese translations.
Merge commit '
cd724d281cd3569afa86b9c4b4ee0b5297550489'
* commit '
cd724d281cd3569afa86b9c4b4ee0b5297550489':
Update Portuguese translations.
Android (Google) Code Review [Wed, 10 Jun 2009 22:32:58 +0000 (15:32 -0700)]
Eric Fischer [Wed, 10 Jun 2009 22:32:37 +0000 (15:32 -0700)]
am
93267d95: am
f6a28267: AI 149721: Import Portuguese translations.
Merge commit '
93267d9521d0b5099f95afe2eaff32b8bf1f8cc8'
* commit '
93267d9521d0b5099f95afe2eaff32b8bf1f8cc8':
AI 149721: Import Portuguese translations.
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