merge heads

.hgignore

@@ -4,7 +4,7 @@ syntax:glob
 */gen/**
 */proguard/**
 .metadata
-MyTracksTest/annotations.log
+MyTracksTest/AnnotationProcessor.log
 **/*.pyc
 **/*.pyo
 syntax: glob

MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java

@@ -275,7 +275,6 @@ public class DocsHelper {
   public void addTrackRow(Context context, AuthManager trixAuth,
       String spreadsheetId, String worksheetId, Track track,
       boolean metricUnits) throws IOException {
-
     String worksheetUri = String.format(DOCS_SPREADSHEET_URL_FORMAT,
         spreadsheetId, worksheetId);
     TripStatistics stats = track.getStatistics();
@@ -287,16 +286,11 @@ public class DocsHelper {
     String elevationUnit = context.getString(metricUnits ?
         R.string.meter : R.string.feet);
 
-    java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
-    java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
-    Date startTime = new Date(stats.getStartTime());
-    String dateString = dateFormat.format(startTime) + " " + timeFormat.format(startTime);
-    
     // Prepare the Post-Text we are going to send.
     DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits)
         .append("name", track.getName())
         .append("description", track.getDescription())
-        .append("date", dateString)
+        .append("date", getDisplayDate(context, stats.getStartTime()))
         .append("totaltime", StringUtils.formatTimeAlwaysShowingHours(
             stats.getTotalTime()))
         .append("movingtime", StringUtils.formatTimeAlwaysShowingHours(
@@ -336,6 +330,21 @@ public class DocsHelper {
     Log.i(Constants.TAG, "Post finished.");
   }
 
+  /**
+   * Gets the display string for a time based on the phone's setting.
+   *
+   * @param context the context to obtain the phone's setting.
+   * @param time the time
+   * @return the display string of the time
+   */
+  protected String getDisplayDate(Context context, long time) {
+    java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
+    java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
+    Date startTime = new Date(time);
+    String dateString = dateFormat.format(startTime) + " " + timeFormat.format(startTime);
+    return dateString;
+  }
+
   /**
    * Writes spreadsheet row data to the indicated worksheet.
    *

MyTracksTest/.classpath

@@ -3,12 +3,12 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
+	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracksTest/.factorypath

@@ -1,6 +1,7 @@
 <factorypath>
     <factorypathentry kind="WKSPJAR" id="/MyTracksTest/libs/AndroidMockGenerator.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-13/android.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-14/android.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon_google_apis_google_inc_13/libs/maps.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon-google_apis-google_inc_-14/libs/maps.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="MYTRACKS_BIN" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/MyTracksLib/bin/mytrackslib.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="MYTRACKS_BIN/classes" enabled="true" runInBatchMode="false"/>
 </factorypath>

MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,7 +1,7 @@
-#Mon Nov 01 02:42:03 BRST 2010
+#Tue Oct 25 14:08:44 PDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=true
 org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.processorOptions/bin_dir=%PROJECT.DIR%/bin
+org.eclipse.jdt.apt.processorOptions/bin_dir=%PROJECT.DIR%/bin/classes
-org.eclipse.jdt.apt.processorOptions/logfile=%PROJECT.DIR%/annotations.log
+org.eclipse.jdt.apt.processorOptions/logfile=%PROJECT.DIR%/AnnotationProcessor.log
 org.eclipse.jdt.apt.reconcileEnabled=false

MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java

@@ -40,6 +40,7 @@ import junit.framework.TestCase;
  */
 public class DocsHelper_AddTrackRowTest extends TestCase {
   private static final long TIME = 1288721514000L;
+  private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);  
   
   private static class StringWritingDocsHelper extends DocsHelper {
     String writtenSheetUri = null;
@@ -54,16 +55,20 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
   }
   
   public void testAddTrackRow_imperial() throws Exception {
-    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
+    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper() {
+      @Override
+      protected String getDisplayDate(Context context, long time) {
+        return DATE_FORMAT.format(new Date(TIME));
+      }
+    };
     addTrackRow(docsHelper, false);
  
-    DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);    
     String expectedData =
       "<entry xmlns='http://www.w3.org/2005/Atom' "
       + "xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'>"
       + "<gsx:name><![CDATA[trackName]]></gsx:name>"
       + "<gsx:description><![CDATA[trackDescription]]></gsx:description>"
-      + "<gsx:date><![CDATA[" + dateFormat.format(new Date(TIME)) + "]]></gsx:date>"
+      + "<gsx:date><![CDATA[" + DATE_FORMAT.format(new Date(TIME)) + "]]></gsx:date>"
       + "<gsx:totaltime><![CDATA[0:00:05]]></gsx:totaltime>"
       + "<gsx:movingtime><![CDATA[0:00:04]]></gsx:movingtime>"
       + "<gsx:distance><![CDATA[12.43]]></gsx:distance>"
@@ -89,7 +94,12 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
   }
 
   public void testAddTrackRow_metric() throws Exception {
-    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper();
+    StringWritingDocsHelper docsHelper = new StringWritingDocsHelper() {
+      @Override
+      protected String getDisplayDate(Context context, long time) {
+        return DATE_FORMAT.format(new Date(TIME));
+      }
+    };
     addTrackRow(docsHelper, true);
 
     // The imperial test verifies that the tags come out in the proper order,

SignalStrengthSamplerTest/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SignalStrengthSampler"/>
+	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>