merge heads

2012-06-20 14:40:44 -07:00
parent bf9afd4f83
commit 78cd1914b8
5 changed files with 188 additions and 14 deletions
@@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;

 import android.content.Context;
 import android.content.Intent;
@@ -999,4 +1000,14 @@ public class ChartView extends View {
        return false;
    }
  }
+  
+  /**
+   * Returns the status of metricUnits.
+   * 
+   * @return the status of metricUnits
+   */
+  @VisibleForTesting
+  public boolean isMetricUnits() {
+    return metricUnits;
+  }
 }