Merge from main repo

MyTracks/src/com/google/android/apps/mytracks/Constants.java

@@ -200,7 +200,7 @@ public abstract class Constants {
   }
 
   public static final String MAPSHOP_BASE_URL =
-    "http://maps.google.com/maps/ms";
+    "https://maps.google.com/maps/ms";
 
   /*
    * Default values - keep in sync with those in preferences.xml.

MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java

@@ -95,6 +95,15 @@ public class ImportAllTracks {
       Log.i(Constants.TAG, "ImportAllTracks: Releasing wake lock.");
     }
 
+    activity.runOnUiThread(new Thread() {
+      @Override
+      public void run() {
+        showDoneDialog();
+      }
+    });
+  }
+
+  private void showDoneDialog() {
     Log.i(Constants.TAG, "ImportAllTracks: Done");
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     if (gpxFileCount == 0) {

MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java

@@ -76,13 +76,13 @@ public class SendToFusionTables implements Runnable {
 
   /** The path for viewing a map visualization of a table. */
   private static final String FUSIONTABLES_MAP =
-      "http://www.google.com/fusiontables/embedviz?" +
+      "https://www.google.com/fusiontables/embedviz?" +
       "viz=MAP&q=select+col0,+col1,+col2,+col3+from+%s+&h=false&" +
       "lat=%f&lng=%f&z=%d&t=1&l=col2";
 
   /** Standard base feed url for Fusion Tables. */
   private static final String FUSIONTABLES_BASE_FEED_URL =
-      "http://www.google.com/fusiontables/api/query";
+      "https://www.google.com/fusiontables/api/query";
 
   private static final int MAX_POINTS_PER_UPLOAD = 2048;
 

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

@@ -44,6 +44,8 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -55,15 +57,15 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class DocsHelper {
   private static final String DOCS_FEED_URL =
-    "http://docs.google.com/feeds/documents/private/full";
+    "https://docs.google.com/feeds/documents/private/full";
   private static final String DOCS_SPREADSHEET_URL =
-      "http://docs.google.com/feeds/documents/private/full/spreadsheet%3A";
+      "https://docs.google.com/feeds/documents/private/full/spreadsheet%3A";
   private static final String DOCS_WORKSHEETS_URL_FORMAT =
-    "http://spreadsheets.google.com/feeds/worksheets/%s/private/full";
+    "https://spreadsheets.google.com/feeds/worksheets/%s/private/full";
   private static final String DOCS_MY_SPREADSHEETS_FEED_URL =
-    "http://docs.google.com/feeds/documents/private/full?category=mine,spreadsheet";
+    "https://docs.google.com/feeds/documents/private/full?category=mine,spreadsheet";
   private static final String DOCS_SPREADSHEET_URL_FORMAT =
-    "http://spreadsheets.google.com/feeds/list/%s/%s/private/full";
+    "https://spreadsheets.google.com/feeds/list/%s/%s/private/full";
 
   private static final String CONTENT_TYPE_PARAM = "Content-Type";
   private static final String OPENDOCUMENT_SPREADSHEET_MIME_TYPE =
@@ -285,11 +287,13 @@ public class DocsHelper {
     String elevationUnit = context.getString(metricUnits ?
         R.string.meter : R.string.feet);
 
+    DateFormat trackDateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+
     // Prepare the Post-Text we are going to send.
     DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits)
         .append("name", track.getName())
         .append("description", track.getDescription())
-        .append("date", String.format("%tc", stats.getStartTime()))
+        .append("date", trackDateFormat.format(new Date(stats.getStartTime())))
         .append("totaltime", StringUtils.formatTimeAlwaysShowingHours(
             stats.getTotalTime()))
         .append("movingtime", StringUtils.formatTimeAlwaysShowingHours(

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

@@ -19,7 +19,9 @@ import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
+import java.util.Locale;
 
 /**
  * <p>This class builds a string of XML tags used to talk to Docs using GData.
@@ -43,12 +45,12 @@ import java.text.NumberFormat;
  * @author Matthew Simmons
  */
 class DocsTagBuilder {
-  // TODO(simmonmt): These formats aren't I18N-compatible.  Not everyone uses
+  private static final DecimalFormatSymbols FORMAT_SYMBOLS =
-  // commas for thousands and dots for the decimal point.
+      DecimalFormatSymbols.getInstance(Locale.ENGLISH);
   private static final NumberFormat LARGE_UNIT_FORMAT =
-    new DecimalFormat("#,###,###.00");
+      new DecimalFormat("#,###,###.00", FORMAT_SYMBOLS);
   private static final NumberFormat SMALL_UNIT_FORMAT =
-    new DecimalFormat("###,###");
+      new DecimalFormat("###,###", FORMAT_SYMBOLS);
 
   protected final boolean metricUnits;
   protected final StringBuilder stringBuilder;
@@ -59,7 +61,7 @@ class DocsTagBuilder {
    */
   DocsTagBuilder(boolean metricUnits) {
     this.metricUnits = metricUnits;
-    stringBuilder = new StringBuilder();
+    this.stringBuilder = new StringBuilder();
   }
 
   /** Appends a tag containing a string value */

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsConstants.java

@@ -7,7 +7,7 @@ package com.google.android.apps.mytracks.io.mymaps;
 public class MyMapsConstants {
   static final String TAG = "MapsApi";
   static final String MAPSHOP_BASE_URL =
-      "http://maps.google.com/maps/ms";
+      "https://maps.google.com/maps/ms";
   public static final String SERVICE_NAME = "local";
 
   /**