youtaol b6b54923b2 Merge heads

2013-08-22 10:14:45 +08:00

..

.settings

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

libs

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

res

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

src/com/google/android/apps/mytracks/endtoendtest

Merge heads

2013-08-22 10:14:45 +08:00

.classpath

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

.factorypath

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

.project

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

AndroidManifest.xml

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

lint.xml

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

MyTracksTests.launch

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

project.properties

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00