From 2bd573438654d6357b4270f959d2d9f731456ded Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 14 Nov 2013 14:01:26 -0800
Subject: [PATCH] Adjust fade out duration and fix degree font size

---
 MyTracks/res/anim/fadeout.xml                            | 2 +-
 MyTracks/res/values/styles.xml                           | 2 --
 .../google/android/apps/mytracks/util/StatsUtils.java    | 9 ++-------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/MyTracks/res/anim/fadeout.xml b/MyTracks/res/anim/fadeout.xml
index cbfa9bbcb..231311626 100644
--- a/MyTracks/res/anim/fadeout.xml
+++ b/MyTracks/res/anim/fadeout.xml
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-  android:duration="2000"
+  android:duration="1000"
   android:fromAlpha="1.0"
   android:interpolator="@android:anim/linear_interpolator"
   android:toAlpha="0.0" />
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index c2b4a442c..4a263becb 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -202,8 +202,6 @@ limitations under the License.
   <!-- stats unit -->
   <style name="StatsUnit" parent="@style/TextSmall">
     <item name="android:paddingLeft">4dp</item>
-    <!-- Add paddingTop to support unit with superscript -->
-    <item name="android:paddingTop">4dp</item>
     <item name="android:singleLine">true</item>
   </style>
   <style name="Text">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
index af046e791..d12d05f18 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
@@ -23,9 +23,6 @@ import com.google.android.maps.mytracks.R;
 import android.app.Activity;
 import android.content.Context;
 import android.location.Location;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.SuperscriptSpan;
 import android.view.View;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -322,10 +319,8 @@ public class StatsUtils {
   private static void setCoordinateValue(
       Context context, View view, int labelId, double coordinate) {
     String value = Double.isNaN(coordinate) || Double.isInfinite(coordinate) ? null
-        : Location.convert(coordinate, Location.FORMAT_DEGREES);
-    SpannableStringBuilder unit = new SpannableStringBuilder(COORDINATE_DEGREE);
-    unit.setSpan(new SuperscriptSpan(), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    setItem(context, view, labelId, value, unit);
+        : Location.convert(coordinate, Location.FORMAT_DEGREES) + COORDINATE_DEGREE;
+    setItem(context, view, labelId, value, null);
   }
 
   /**