Merging to head.

This commit is contained in:
Rodrigo Damazio
2011-10-20 20:03:43 -02:00
parent fe33982df7
commit 1b1f3e3d8b
118 changed files with 3449 additions and 703 deletions
@@ -71,24 +71,12 @@ public class RecordingStateReceiverTest extends AndroidTestCase {
assertServiceCalls(1, 0);
}
public void testOnReceive_resume() {
receiver.onReceive(context,
new Intent(context.getString(R.string.track_resumed_broadcast_action)));
assertServiceCalls(1, 0);
}
public void testOnReceive_stop() {
receiver.onReceive(context,
new Intent(context.getString(R.string.track_stopped_broadcast_action)));
assertServiceCalls(0, 1);
}
public void testOnReceive_pause() {
receiver.onReceive(context,
new Intent(context.getString(R.string.track_paused_broadcast_action)));
assertServiceCalls(0, 1);
}
public void testOnReceive_noAutoStart() {
preferences
.edit()