OSDN Git Service
Android (Google) Code Review [Fri, 22 May 2009 19:23:02 +0000 (12:23 -0700)]
am
f4963af4: Merge change 2339 into donut
Merge commit '
f4963af4ed00afc31b6c5fddc767995aafe2c465'
* commit '
f4963af4ed00afc31b6c5fddc767995aafe2c465':
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 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 18:31:54 +0000 (11:31 -0700)]
am
95c4919a: Merge change 1923 into donut
Merge commit '
95c4919a2811d131a2d4d8d7eaa83758cd082313'
* commit '
95c4919a2811d131a2d4d8d7eaa83758cd082313':
Fix crash in MusicPicker activity
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 [Fri, 22 May 2009 00:54:41 +0000 (17:54 -0700)]
am
2b0b9137: 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.
Merge commit '
2b0b91376a7101fafdf8b007ae660d8b2a039530'
* commit '
2b0b91376a7101fafdf8b007ae660d8b2a039530':
Decouple the service interface stub from the service, so that the
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 22:18:28 +0000 (15:18 -0700)]
am
756c3f57: Findbugs fixes. Mostly performance related (remove unnecessary code, make inner classes static)
Merge commit '
756c3f57f11a7bb3bf1cf1333ee8ffbc51039748'
* commit '
756c3f57f11a7bb3bf1cf1333ee8ffbc51039748':
Findbugs fixes. Mostly performance related (remove unnecessary code, make inner classes static)
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 23:05:21 +0000 (16:05 -0700)]
am
9d989c4: Don\'t show menu in oneshot mode, since it\'s not useful and m
Merge commit '
9d989c480204167cf983ba4dc3eac9dec5cddef9'
* commit '
9d989c480204167cf983ba4dc3eac9dec5cddef9':
Don't show menu in oneshot mode, since it's not useful and may confuse other parts of the code.
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:46:44 +0000 (12:46 -0700)]
Marco Nelissen [Mon, 11 May 2009 19:43:13 +0000 (12:43 -0700)]
Remove unused code.
Marco Nelissen [Mon, 11 May 2009 17:33:35 +0000 (10:33 -0700)]
Marco Nelissen [Mon, 11 May 2009 17:28:31 +0000 (10:28 -0700)]
Fix comment.
Marco Nelissen [Mon, 11 May 2009 17:01:06 +0000 (10:01 -0700)]
am
407cf91: Looks like something got lost during a previous commit, uplo
Merge commit '
407cf91b661ceeb3ced16dc20af8243b9a0eb632'
* commit '
407cf91b661ceeb3ced16dc20af8243b9a0eb632':
Looks like something got lost during a previous commit, upload or submit.
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:51 +0000 (15:00 -0700)]
am
f79d4a7: Merge change 1102 into donut
Merge commit '
f79d4a73a7ad2af513d4a18495c050fe04f0c79d'
* commit '
f79d4a73a7ad2af513d4a18495c050fe04f0c79d':
Make it so that isPlaying() returns whether the service is playing, even
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:59:09 +0000 (14:59 -0700)]
am
4341b50: When doing a youtube/amazon/browser search from the music ap
Merge commit '
4341b5006cffbbd016688d4533f6de68d9d4c49b'
* commit '
4341b5006cffbbd016688d4533f6de68d9d4c49b':
When doing a youtube/amazon/browser search from the music app, make it a new task.
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 23:05:17 +0000 (16:05 -0700)]
am
3fdd97f: Postpone doing actual work in QueryBrowserActivity until it\'
Merge commit '
3fdd97fb21031de30e604d470fc8458b814e6587'
* commit '
3fdd97fb21031de30e604d470fc8458b814e6587':
Postpone doing actual work in QueryBrowserActivity until it's bound to the playback service.
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:54:57 +0000 (14:54 -0700)]
am
b7841ac: Rename some methods to confirm to our naming standards.
Merge commit '
b7841acd23f0cf4fd8db604d73bdf14e57994fd9'
* commit '
b7841acd23f0cf4fd8db604d73bdf14e57994fd9':
Rename some methods to confirm to our naming standards.
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 19:00:51 +0000 (12:00 -0700)]
am
565d10c: Merge change 880 into donut
Merge commit '
565d10ccc3a260f6929ada5a5f59d9429e3c0fcf'
* commit '
565d10ccc3a260f6929ada5a5f59d9429e3c0fcf':
Switch Music app to use the new 'fancy' search uri internally, and the 'basic' search uri
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 01:13:05 +0000 (18:13 -0700)]
am
f02cf10: am
3134634: AI 148147: Import lots of zh_TW translation chan
Merge commit '
f02cf10b5cb8cf8a391db26f5c9c694685572fa4'
* commit '
f02cf10b5cb8cf8a391db26f5c9c694685572fa4':
AI 148147: Import lots of zh_TW translation changes.
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 20:43:29 +0000 (13:43 -0700)]
am
0e3e125: am
bd510b5: AI 147962: Import updated zh_TW translations.
Merge commit '
0e3e125e53a18f24b0a3db07f7b2657566f647bf'
* commit '
0e3e125e53a18f24b0a3db07f7b2657566f647bf':
AI 147962: Import updated zh_TW translations.
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
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:18 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:38 +0000 (17:12 -0700)]
Merge donut into master
Eric Fischer [Wed, 22 Apr 2009 19:33:56 +0000 (12:33 -0700)]
AI 147406: Import revised translations.
Automated import of CL 147406
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)
Dianne Hackborn [Mon, 13 Apr 2009 23:13:42 +0000 (16:13 -0700)]
Merge branch 'readonly-p4-master'
Dianne Hackborn [Mon, 13 Apr 2009 23:11:59 +0000 (16:11 -0700)]
AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
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 06:32:29 +0000 (23:32 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Fri, 3 Apr 2009 06:31:17 +0000 (23:31 -0700)]
AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144411
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
The Android Open Source Project [Wed, 1 Apr 2009 04:34:26 +0000 (21:34 -0700)]
Merge commit 'goog/readonly-p4-master'
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 21:37:24 +0000 (14:37 -0700)]
AI 143794: am: CL 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/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143794
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
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).
The Android Open Source Project [Sun, 29 Mar 2009 15:55:34 +0000 (08:55 -0700)]
Merge branch 'open_source_contributions_cherry_picked' into google_internal
Dianne Hackborn [Sat, 28 Mar 2009 02:19:20 +0000 (19:19 -0700)]
AI 143364: am: CL 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/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143364
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
Jack Palevich [Fri, 27 Mar 2009 22:35:34 +0000 (15:35 -0700)]
AI 143243: am: CL 142797 am: CL 142796 Change spacing of the green playing icon in music lists to match the UI spec.
We had been aligning them to the baseline of the artist, text, but now we
space them below the duration text.
Original author: jackpal
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143243
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 23:15:03 +0000 (16:15 -0700)]
Automated import from //branches/master/...@142762,142762
Eric Fischer [Wed, 25 Mar 2009 23:13:52 +0000 (16:13 -0700)]
Automated import from //branches/master/...@142759,142759
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:32:53 +0000 (21:32 -0700)]
Automated import from //branches/master/...@142101,142101
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:23:42 +0000 (21:23 -0700)]
Automated import from //branches/master/...@142025,142025
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:06:32 +0000 (21:06 -0700)]
Automated import from //branches/master/...@141869,141869
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 02:18:26 +0000 (19:18 -0700)]
Automated import from //branches/master/...@141033,141033
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:15 +0000 (18:47 -0700)]
Automated import from //branches/master/...@140875,140875
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:10:17 +0000 (18:10 -0700)]
Automated import from //branches/master/...@140651,140651
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 01:00:32 +0000 (18:00 -0700)]
Automated import from //branches/master/...@140591,140591
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