10 Commits

Author	SHA1	Message	Date
Jimmy Shih	e813995b34	Add new location setting policy	2013-11-26 15:45:33 -08:00
Jimmy Shih	abcf7cddff	Code refactor of GoogleLocationUtils	2013-11-26 12:38:44 -08:00
Jimmy Shih	2ae1d7fe29	Set dialog title divider for preference dialogs	2013-11-25 15:52:12 -08:00
Jimmy Shih	ab1226fa31	Set dialog title divider for dialogfragment	2013-11-25 15:09:12 -08:00
Jimmy Shih	be2d66d4ab	Revert menu icon color for froyo phones	2013-11-25 10:11:53 -08:00
Jimmy Shih	47c189409e	Add menu option for merge and play	2013-11-24 12:56:42 -08:00
Jimmy Shih	9442416844	Remove choose activity type dialog beore starting a new one. Remove clear button next to text edit for api level < 11	2013-11-22 11:43:49 -08:00
Jimmy Shih	0d65e5cafc	Code refactor to reuse ChooseActivityTypeDialog in PreferenecActivity	2013-11-20 11:33:58 -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