OSDN Git Service
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
Marco Nelissen [Tue, 9 Jun 2009 23:34:32 +0000 (16:34 -0700)]
am
203c930e: Add write-to-sd-card permission to music app
Merge commit '
203c930e340e7fa0799c18193acef2fc60559f3e'
* commit '
203c930e340e7fa0799c18193acef2fc60559f3e':
Add write-to-sd-card permission to music app
Marco Nelissen [Tue, 9 Jun 2009 19:56:55 +0000 (12:56 -0700)]
Add write-to-sd-card permission to music app
Marco Nelissen [Sat, 6 Jun 2009 04:17:32 +0000 (21:17 -0700)]
am
bf0ea148: Shave about 1500 milliseconds off the time it takes to restore a large playlist, with corresponding reduction in music playback service startup time.
Merge commit '
bf0ea148eefcffd43e6f5023a6f8365d74fb829f'
* commit '
bf0ea148eefcffd43e6f5023a6f8365d74fb829f':
Shave about 1500 milliseconds off the time it takes to restore a large playlist,
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 [Fri, 5 Jun 2009 05:42:35 +0000 (22:42 -0700)]
am
11232b0a: Fix for a hang when attempting to stream a non-existing content.
Merge commit '
11232b0a86408237d8f4f6ebe324a27d27d72ca3'
* commit '
11232b0a86408237d8f4f6ebe324a27d27d72ca3':
Fix for a hang when attempting to stream a non-existing content.
The Android Open Source Project [Fri, 5 Jun 2009 01:15:27 +0000 (18:15 -0700)]
am
3d54a51b: but empty merge (change already merged)
Merge commit '
3d54a51b3ce7f7121bcf4b8bd99510ac1cfbaa37'
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.
Marco Nelissen [Wed, 3 Jun 2009 23:09:18 +0000 (16:09 -0700)]
Replace usage of deprecated PhoneStateIntentReceiver with PhoneStateListener.
Mike Lockwood [Wed, 3 Jun 2009 21:32:15 +0000 (14:32 -0700)]
resolved conflicts for merge of 272eb7 to master
Mike Lockwood [Wed, 3 Jun 2009 19:59:55 +0000 (12:59 -0700)]
am
05a0cdbe: Use event time to detect long press in MediaButtonIntentReceiver.
Merge commit '
05a0cdbe327ce82165bf5fe4010414173fcdaae0'
* commit '
05a0cdbe327ce82165bf5fe4010414173fcdaae0':
Use event time to detect long press in MediaButtonIntentReceiver.
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 19:31:42 +0000 (12:31 -0700)]
am
49e36ea9: Clean up some handlers when the service is destroyed. This should fix some more of the monkey bugs in the music app.
Merge commit '
49e36ea916aefba042c6e927c771b10708b6891e'
* commit '
49e36ea916aefba042c6e927c771b10708b6891e':
Clean up some handlers when the service is destroyed. This should fix some more of the monkey bugs in the music app.
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 21:16:41 +0000 (14:16 -0700)]
am
47b989bf: This should fix a monkey bug where the service was being used after it was unbound.
Merge commit '
47b989bf6205eb8dd51c2c1fa118f6b703f2f66d'
* commit '
47b989bf6205eb8dd51c2c1fa118f6b703f2f66d':
This should fix a monkey bug where the service was being used after it was unbound.
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 [Tue, 26 May 2009 17:11:27 +0000 (10:11 -0700)]
am
479ccad3: Merge from cupcake_dcm. Should be reviewed by jackpal. Internal issue:
1753548. CL#144715
Merge commit '
479ccad3431f06fa0f9ae866129e11baaa5c5306'
* commit '
479ccad3431f06fa0f9ae866129e11baaa5c5306':
Merge from cupcake_dcm. Should be reviewed by jackpal.
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: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
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 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
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)
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