OSDN Git Service
Mike Cleron [Thu, 1 Oct 2009 20:39:01 +0000 (13:39 -0700)]
Mike Cleron [Thu, 1 Oct 2009 18:54:03 +0000 (11:54 -0700)]
Mike Cleron [Thu, 1 Oct 2009 18:12:15 +0000 (11:12 -0700)]
Mike Cleron [Thu, 1 Oct 2009 04:15:32 +0000 (21:15 -0700)]
Mike Cleron [Thu, 1 Oct 2009 01:28:37 +0000 (18:28 -0700)]
Fix widgets
Mike Cleron [Wed, 30 Sep 2009 08:36:00 +0000 (01:36 -0700)]
Mike Cleron [Wed, 30 Sep 2009 08:16:15 +0000 (01:16 -0700)]
Newer icons
Mike Cleron [Tue, 29 Sep 2009 07:51:35 +0000 (00:51 -0700)]
Mike Cleron [Tue, 29 Sep 2009 07:27:38 +0000 (00:27 -0700)]
New icons
Marco Nelissen [Fri, 25 Sep 2009 18:26:40 +0000 (11:26 -0700)]
am
d7c88e26: am
38ad8fdc: Merge change 27050 into eclair
Merge commit '
d7c88e2609d8329e2672dd214bafaa846508da77'
* commit '
d7c88e2609d8329e2672dd214bafaa846508da77':
The new tall screen layout really only works for a subset of tall screens,
Yu Shan Emily Lau [Fri, 25 Sep 2009 18:24:39 +0000 (11:24 -0700)]
am
340c3b54: am
3399eda8: Merge change 27014 into eclair
Merge commit '
340c3b549da9a682ff096ce29c0326d608bd0862'
* commit '
340c3b549da9a682ff096ce29c0326d608bd0862':
Modified the test case name into a more meaningful name.
Marco Nelissen [Fri, 25 Sep 2009 18:10:51 +0000 (11:10 -0700)]
am
745a2b28: am
c1017e5f: onStart() can now receive a null Intent, so deal with that.
Merge commit '
745a2b28a1781a864f68e56a15a5ded4debeaad5'
* commit '
745a2b28a1781a864f68e56a15a5ded4debeaad5':
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Fri, 25 Sep 2009 18:05:54 +0000 (11:05 -0700)]
am
8dd6cacc: am
f90b4e14: Merge change 26859 into eclair
Merge commit '
8dd6cacc2511148d4a976bea81efe2a7a5d611ce'
* commit '
8dd6cacc2511148d4a976bea81efe2a7a5d611ce':
Add a special playback activity layout for tall screens to make better use of the screen real estate.
Marco Nelissen [Fri, 25 Sep 2009 17:51:10 +0000 (10:51 -0700)]
am
d7381c45: am
cabe6de4: Merge change 26657 into eclair
Merge commit '
d7381c451884fbcdd19659327d132561ead0f768'
* commit '
d7381c451884fbcdd19659327d132561ead0f768':
Fix title bar in album browser.
Marco Nelissen [Fri, 25 Sep 2009 17:43:28 +0000 (10:43 -0700)]
am
38ad8fdc: Merge change 27050 into eclair
Merge commit '
38ad8fdc42c0f1289bf824659b257fefc35fe25b' into eclair-plus-aosp
* commit '
38ad8fdc42c0f1289bf824659b257fefc35fe25b':
The new tall screen layout really only works for a subset of tall screens,
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.
Daniel Sandler [Fri, 25 Sep 2009 15:52:00 +0000 (08:52 -0700)]
am
53e3f5db: am
93db4939: Fix invalid XML in Music list view layout.
Merge commit '
53e3f5db8a3578b2c2efa1253b3ef0c5381cd671'
* commit '
53e3f5db8a3578b2c2efa1253b3ef0c5381cd671':
Fix invalid XML in Music list view layout.
Yu Shan Emily Lau [Fri, 25 Sep 2009 15:32:45 +0000 (08:32 -0700)]
am
3399eda8: Merge change 27014 into eclair
Merge commit '
3399eda8525d9515da90296ef730fd0affab20c3' into eclair-plus-aosp
* commit '
3399eda8525d9515da90296ef730fd0affab20c3':
Modified the test case name into a more meaningful name.
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 21:16:44 +0000 (14:16 -0700)]
am
c1017e5f: onStart() can now receive a null Intent, so deal with that.
Merge commit '
c1017e5fe69da3a4ffd2bf7d0890a1a216265a61' into eclair-plus-aosp
* commit '
c1017e5fe69da3a4ffd2bf7d0890a1a216265a61':
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Thu, 24 Sep 2009 20:21:06 +0000 (13:21 -0700)]
onStart() can now receive a null Intent, so deal with that.
Marco Nelissen [Thu, 24 Sep 2009 17:05:26 +0000 (10:05 -0700)]
am
f90b4e14: Merge change 26859 into eclair
Merge commit '
f90b4e14c0dbabc34681163bd4e1defb524c12e1' into eclair-plus-aosp
* commit '
f90b4e14c0dbabc34681163bd4e1defb524c12e1':
Add a special playback activity layout for tall screens to make better use of the screen real estate.
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.
Marco Nelissen [Wed, 23 Sep 2009 20:28:00 +0000 (13:28 -0700)]
am
cabe6de4: Merge change 26657 into eclair
Merge commit '
cabe6de41d7e1449267b482dbff4c6191870e457' into eclair-plus-aosp
* commit '
cabe6de41d7e1449267b482dbff4c6191870e457':
Fix title bar in album browser.
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 18:07:47 +0000 (11:07 -0700)]
am
93db4939: Fix invalid XML in Music list view layout.
Merge commit '
93db4939c4adb99623df50b03650bcc2bb1473e2' into eclair-plus-aosp
* commit '
93db4939c4adb99623df50b03650bcc2bb1473e2':
Fix invalid XML in Music list view layout.
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 21:10:19 +0000 (14:10 -0700)]
am
943a04ac: am
82b4bf76: Added the music player do nothing test case to add the basic line.
Merge commit '
943a04ace3fd6f449c14b8ff78dab80aaadef27f'
* commit '
943a04ace3fd6f449c14b8ff78dab80aaadef27f':
Added the music player do nothing test case to add the basic line.
Yu Shan Emily Lau [Mon, 21 Sep 2009 21:04:15 +0000 (14:04 -0700)]
am
82b4bf76: Added the music player do nothing test case to add the basic line.
Merge commit '
82b4bf7645c64e2d2af020b8ebce33268ce3c259' into eclair-plus-aosp
* commit '
82b4bf7645c64e2d2af020b8ebce33268ce3c259':
Added the music player do nothing test case to add the basic line.
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 22:26:33 +0000 (15:26 -0700)]
am
395e77a2: (-s ours) am
db0769a8: Import revised translations. DO NOT MERGE
Merge commit '
395e77a2e44c76072991492a619f916c251e39bb'
* commit '
395e77a2e44c76072991492a619f916c251e39bb':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:16 +0000 (15:15 -0700)]
am
db0769a8: Import revised translations. DO NOT MERGE
Merge commit '
db0769a8b404e4cda6827178cc55b691b82cdbf0' into eclair-plus-aosp
* commit '
db0769a8b404e4cda6827178cc55b691b82cdbf0':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:34:51 +0000 (14:34 -0700)]
Import revised translations. DO NOT MERGE
Marco Nelissen [Thu, 10 Sep 2009 17:03:20 +0000 (10:03 -0700)]
am
aa33c778: am
8f2b5a2d: Merge change 24529 into eclair
Merge commit '
aa33c778fab30713a29b0a703a45c18407604950'
* commit '
aa33c778fab30713a29b0a703a45c18407604950':
Use dpad left/right for skipping and seeking only when the play buttons are focused.
Marco Nelissen [Thu, 10 Sep 2009 16:58:53 +0000 (09:58 -0700)]
am
8f2b5a2d: Merge change 24529 into eclair
Merge commit '
8f2b5a2d9bf33b794950fea96d92739d856cf831' into eclair-plus-aosp
* commit '
8f2b5a2d9bf33b794950fea96d92739d856cf831':
Use dpad left/right for skipping and seeking only when the play buttons are focused.
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.
Nick Pelly [Wed, 9 Sep 2009 23:28:33 +0000 (16:28 -0700)]
am
56d2b6eb: am
98647f16: Merge change 24278 into eclair
Merge commit '
56d2b6eb68fd876a3aed27194a19dcc49f1bcc75'
* commit '
56d2b6eb68fd876a3aed27194a19dcc49f1bcc75':
Update application for Bluetooth API change: deprecation of BluetoothError.
Marco Nelissen [Wed, 9 Sep 2009 23:28:08 +0000 (16:28 -0700)]
am
3930b024: am
7a05298d: Only log the sd card status when it changed from last time.
Merge commit '
3930b024b20e6af5654aa76b34eb9d512e380d02'
* commit '
3930b024b20e6af5654aa76b34eb9d512e380d02':
Only log the sd card status when it changed from last time.
Nick Pelly [Wed, 9 Sep 2009 18:39:08 +0000 (11:39 -0700)]
am
98647f16: Merge change 24278 into eclair
Merge commit '
98647f16607f26e282738efb3bd7fa1a92cefa16' into eclair-plus-aosp
* commit '
98647f16607f26e282738efb3bd7fa1a92cefa16':
Update application for Bluetooth API change: deprecation of BluetoothError.
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 18:29:39 +0000 (11:29 -0700)]
am
7a05298d: Only log the sd card status when it changed from last time.
Merge commit '
7a05298d5af6f796f3a260fa60b11d1c029b4207' into eclair-plus-aosp
* commit '
7a05298d5af6f796f3a260fa60b11d1c029b4207':
Only log the sd card status when it changed from last time.
Eric Fischer [Wed, 9 Sep 2009 17:57:17 +0000 (10:57 -0700)]
am
323868ba: (-s ours) am
533b2de9: Import revised translations. DO NOT MERGE
Merge commit '
323868baab8846ed42ce11c56b382cfaf6720926'
* commit '
323868baab8846ed42ce11c56b382cfaf6720926':
Import revised translations. DO NOT MERGE
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 [Wed, 9 Sep 2009 00:06:43 +0000 (17:06 -0700)]
am
533b2de9: Import revised translations. DO NOT MERGE
Merge commit '
533b2de9df49faa7cbcd101d89dd432f061a2e23' into eclair-plus-aosp
* commit '
533b2de9df49faa7cbcd101d89dd432f061a2e23':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:29:54 +0000 (16:29 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:13 +0000 (11:06 -0700)]
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:22 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:14 +0000 (14:13 -0700)]
merge from donut
Marco Nelissen [Wed, 2 Sep 2009 20:35:19 +0000 (13:35 -0700)]
am
9df6e737: Don\'t crash when long-pressing on a stream.
Merge commit '
9df6e7376ac6c26b980bc352c62b7f6af8314b98'
* commit '
9df6e7376ac6c26b980bc352c62b7f6af8314b98':
Don't crash when long-pressing on a stream.
Marco Nelissen [Wed, 2 Sep 2009 20:34:31 +0000 (13:34 -0700)]
am
1e5a5673: Show time in the form hh:mm:ss when the duration is 1 hour or more.
Merge commit '
1e5a567390e41045cba6abac1d2c94eb8f59fc30'
* commit '
1e5a567390e41045cba6abac1d2c94eb8f59fc30':
Show time in the form hh:mm:ss when the duration is 1 hour or more.
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 23:13:31 +0000 (16:13 -0700)]
am
42bcc218: Fix some issues with threads/handlers accessing the adapter for the \'old\' activity after it has been handed off to the \'new\' activity.
Merge commit '
42bcc218ce4c330cc609326d168e288f3559c64f'
* commit '
42bcc218ce4c330cc609326d168e288f3559c64f':
Fix some issues with threads/handlers accessing the adapter for the 'old' activity after it has been handed off to the 'new' activity.
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.
Yu Shan Emily Lau [Fri, 28 Aug 2009 21:22:04 +0000 (14:22 -0700)]
am
2df1aa67: Merge change 23119 into eclair
Merge commit '
2df1aa67b60c343d32e815be82307a779c24b70c'
* commit '
2df1aa67b60c343d32e815be82307a779c24b70c':
modified: tests/src/com/android/music/MusicPlayerFunctionalTestRunner.java
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.
Daniel Sandler [Fri, 28 Aug 2009 20:20:55 +0000 (13:20 -0700)]
am
cf868c4c: High-resolution (hdpi) artwork from TAT for Music.
Merge commit '
cf868c4cc432b18d22d51f9156ff3bb1b2cc2e5d'
* commit '
cf868c4cc432b18d22d51f9156ff3bb1b2cc2e5d':
High-resolution (hdpi) artwork from TAT for Music.
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 17:45:08 +0000 (10:45 -0700)]
am
119cd95b: Armor string format tokens with translation placeholders.
Merge commit '
119cd95b455b122df9d7e10ad43cd35f5066e8fe'
* commit '
119cd95b455b122df9d7e10ad43cd35f5066e8fe':
Armor string format tokens with translation placeholders.
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 [Fri, 21 Aug 2009 14:08:57 +0000 (07:08 -0700)]
am
f3b2fb76: Cosmetic: contract the music player\'s seekbar by a few pixels to give the thumb some breathing room. (Related to b/
2064664)
Merge commit '
f3b2fb76c00c64877378bf87a9bb335cf636d5cf'
* commit '
f3b2fb76c00c64877378bf87a9bb335cf636d5cf':
Cosmetic: contract the music player's seekbar by a few pixels to give the thumb some breathing room. (Related to b/
2064664)
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:29:00 +0000 (10:29 -0700)]
am
5df7af34: Fix density issue with album art.
Merge commit '
5df7af3460fe05fb8ceea426b90286b7bafd9827'
* commit '
5df7af3460fe05fb8ceea426b90286b7bafd9827':
Fix density issue with album art.
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 21:19:39 +0000 (14:19 -0700)]
am
d5fc5b6c: Change to use new service foreground API.
Merge commit '
d5fc5b6cc39bc2c2693428fe957bb4ae7f90c0f7'
* commit '
d5fc5b6cc39bc2c2693428fe957bb4ae7f90c0f7':
Change to use new service foreground API.
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 19:08:46 +0000 (12:08 -0700)]
am
99269c9b: (-s ours) am
5d9c780e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
99269c9b8861f876c512d12aa838dbff959e5e58'
* commit '
99269c9b8861f876c512d12aa838dbff959e5e58':
Import revised translations. DO NOT MERGE
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)]
OSDN Git Service
