15 Commits

Author	SHA1	Message	Date
Jimmy Shih	77b54ed03b	merge from main	2011-11-11 12:34:01 -08:00
Jimmy Shih	60f34d89ba	Fix unit test for ResultDialogFactoryTest ... - change to the MyTracks activity because the SendActivity doesn't have a window to display the dialog.	2011-11-10 18:40:26 -08:00
Jimmy Shih	2dd37ff965	merge heads	2011-11-10 17:28:50 -08:00
Jimmy Shih	750d109c93	fix unit test due to AntSensorManager changes	2011-11-10 17:25:28 -08:00
Jimmy Shih	23b5f879ae	merge heads	2011-11-10 16:51:10 -08:00
Jimmy Shih	c573301b2d	merge heads	2011-11-10 16:08:35 -08:00
Jimmy Shih	f24494d877	fix unit test with changing buttons from BUTTON_NEUTRAL to BUTTON_NEGATIVE	2011-11-10 14:24:32 -08:00
Rimas Trumpa	7915202aaa	Some string corrections + getDefaultCategory moved to TrackRecordingService.	2011-11-09 22:03:59 +00:00
Jimmy Shih	f07856ecb7	fix comment on 480bd29719ab	2011-11-08 11:42:12 -08:00
Rimas Trumpa	0cf39e94a2	Added 'Default Activity Type' function (Issue 519).	2011-11-07 15:02:40 +00:00
Jimmy Shih	c63763982a	fix comment b7f41a55cc69	2011-11-05 15:03:18 -07:00
Jimmy Shih	c26e63dec3	merge heads	2011-11-05 12:08:14 -07:00
Jimmy Shih	1911187450	fix comment on 90eb53c0b4bd	2011-11-05 11:44:19 -07:00
Jimmy Shih	4e288e4b85	- remove arrays.xml ... - clean up keys.xml - clean up do_not_translate.xml	2011-11-01 11:34:33 -07:00
Jimmy Shih	684546f080	add translation descriptionws	2011-10-31 11:18:55 -07:00