9 Commits

Author	SHA1	Message	Date
Jimmy Shih	47c189409e	Add menu option for merge and play	2013-11-24 12:56:42 -08:00
Jimmy Shih	bb5d4069cd	fix layout issue for gingerbread	2013-11-22 15:35:02 -08:00
Jimmy Shih	74713239fb	list item, select entire item. not show markers in action bar. Message when photo marker is canceled	2013-11-22 10:37:20 -08:00
Jimmy Shih	76c06f68fb	use custom spinner color	2013-11-21 14:42:08 -08:00
Jimmy Shih	03145839f3	Add custom color for radio button	2013-11-21 14:14:00 -08:00
Jimmy Shih	b90d3193ab	Improve alert dialog theme	2013-11-21 13:37:05 -08:00
Jimmy Shih	41f5206c63	Improve the default activity type preference	2013-11-20 17:49:15 -08:00
Jimmy Shih	63c1330f50	merge heads	2013-11-20 10:36:47 -08:00
Jimmy Shih	45909e70b6	Update calorie when the activity type is set at the end of the track by the activity recognition api	2013-11-05 13:48:43 -08:00