From 6028137c46a1ea26626413476ab27954752df896 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 22 Dec 2011 11:20:16 -0800
Subject: [PATCH] Fix comment on 9399fc25c7ce.

Also define the default values in "do_not_translate.xml" so that can be
consistent between the preferences.xml and the java files.
---
 MyTracks/res/values/do_not_translate.xml      |  3 ++
 MyTracks/res/xml/preferences.xml              | 52 +++++++++----------
 .../maps/DynamicSpeedTrackPathDescriptor.java | 20 +++----
 .../maps/FixedSpeedTrackPathDescriptor.java   | 29 ++++++-----
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index e4b8895a6..2d7adbfab 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -22,6 +22,9 @@ limitations under the License.
   <string name="about_leif">Leif Wilden</string>
   <string name="about_rodrigo">Rodrigo Damazio</string>
   <string name="about_sandor">Sandor Dornbush</string>
+  <string name="color_mode_dynamic_percentage_default">25</string>
+  <string name="color_mode_fixed_medium_default">15</string>
+  <string name="color_mode_fixed_slow_default">9</string>
   <string name="display_track_color_value_dynamic">DYNAMIC</string>
   <string name="display_track_color_value_fixed">FIXED</string>
   <string name="display_track_color_value_none">NONE</string>
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 793389df8..e4befad25 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -32,7 +32,7 @@ limitations under the License.
         android:summaryOn="@string/settings_display_speed_summary_on"
         android:summaryOff="@string/settings_display_speed_summary_off"
         android:defaultValue="true" />
-        
+
     <ListPreference android:key="@string/track_color_mode_key"
         android:title="@string/settings_display_track_color"
         android:summary="@string/settings_display_track_color_summary"
@@ -40,46 +40,46 @@ limitations under the License.
         android:entryValues="@array/display_track_color_values"
         android:defaultValue="@string/display_track_color_value_none"/>
 
-    <PreferenceCategory android:title="@string/settings_display_track_color_fixed" 
+    <PreferenceCategory android:title="@string/settings_display_track_color_fixed"
         android:key="@string/track_color_mode_fixed_speed_options_key">
-        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key" 
-            android:title="@string/settings_display_track_color_fixed_slow" 
-            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
-            android:defaultValue="9" 
+        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key"
+            android:title="@string/settings_display_track_color_fixed_slow"
+            android:summary="@string/settings_display_track_color_fixed_slow_summary"
+            android:defaultValue="@string/color_mode_fixed_slow_default"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
-        
-        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_display_key" 
-            android:title="@string/settings_display_track_color_fixed_slow" 
-            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
-            android:defaultValue="9" 
+
+        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_display_key"
+            android:title="@string/settings_display_track_color_fixed_slow"
+            android:summary="@string/settings_display_track_color_fixed_slow_summary"
+            android:defaultValue="@string/color_mode_fixed_slow_default"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
-        
-        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_key" 
-            android:title="@string/settings_display_track_color_fixed_medium" 
-            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
-            android:defaultValue="15"
+
+        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_key"
+            android:title="@string/settings_display_track_color_fixed_medium"
+            android:summary="@string/settings_display_track_color_fixed_medium_summary"
+            android:defaultValue="@string/color_mode_fixed_medium_default"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
-        
-        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_display_key" 
-            android:title="@string/settings_display_track_color_fixed_medium" 
-            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
-            android:defaultValue="15"
+
+        <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_display_key"
+            android:title="@string/settings_display_track_color_fixed_medium"
+            android:summary="@string/settings_display_track_color_fixed_medium_summary"
+            android:defaultValue="@string/color_mode_fixed_medium_default"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_display_track_color_dynamic">
-        <EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key" 
-            android:title="@string/settings_display_track_color_dynamic_medium" 
-            android:summary="@string/settings_display_track_color_dynamic_medium_summary" 
-            android:defaultValue="25" 
+        <EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key"
+            android:title="@string/settings_display_track_color_dynamic_medium"
+            android:summary="@string/settings_display_track_color_dynamic_medium_summary"
+            android:defaultValue="@string/color_mode_dynamic_percentage_default"
             android:inputType="number"
             android:maxLength="2">
         </EditTextPreference>
@@ -143,7 +143,7 @@ limitations under the License.
         android:summaryOn="@string/settings_recording_name_summary_on"
         android:summaryOff="@string/settings_recording_name_summary_off"
         android:defaultValue="true" />
-        
+
     <com.google.android.apps.mytracks.AutoCompleteTextPreference
         android:key="@string/default_activity_key"
         android:title="@string/settings_recording_default_activity"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
index a65eef5de..11bcc1b42 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
@@ -37,21 +37,22 @@ import android.util.Log;
 public class DynamicSpeedTrackPathDescriptor 
   implements TrackPathDescriptor, OnSharedPreferenceChangeListener {
   
-  private static int DEFAULT_SPEED_MARGIN = 25;
-  
   private int slowSpeed;
   private int normalSpeed;
   private int speedMargin;
+  private final int speedMarginDefault;
   private double averageMovingSpeed;
   private final Context context;
   
   public DynamicSpeedTrackPathDescriptor(Context context){
     this.context = context;
+    speedMarginDefault = Integer.parseInt(
+        context.getString(R.string.color_mode_dynamic_percentage_default));
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
 
     if (prefs == null) {
-      speedMargin = DEFAULT_SPEED_MARGIN;
+      speedMargin = speedMarginDefault;
       return;
     }
     prefs.registerOnSharedPreferenceChangeListener(this);
@@ -60,12 +61,13 @@ public class DynamicSpeedTrackPathDescriptor
   }
 
   private int getSpeedMargin(SharedPreferences sharedPreferences) {
-    String key = context.getString(R.string.track_color_mode_dynamic_speed_variation_key);
-    String percentage = sharedPreferences.getString(key, DEFAULT_SPEED_MARGIN + "");
-    if (percentage.isEmpty()) {
-      return DEFAULT_SPEED_MARGIN;
+    try {
+      return Integer.parseInt(sharedPreferences.getString(
+          context.getString(R.string.track_color_mode_dynamic_speed_variation_key),
+          speedMarginDefault + ""));
+    } catch (NumberFormatException e) {
+      return speedMarginDefault;
     }
-    return Integer.parseInt(percentage);
   }
 
   /**
@@ -99,7 +101,7 @@ public class DynamicSpeedTrackPathDescriptor
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     	
     if (prefs == null) {
-      speedMargin = DEFAULT_SPEED_MARGIN;
+      speedMargin = speedMarginDefault;
       return;
     }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java b/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java
index 6adbbb406..ec962908c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java
@@ -34,32 +34,37 @@ import android.util.Log;
 public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSharedPreferenceChangeListener {
   private int slowSpeed;
   private int normalSpeed;
+  private final int slowDefault;
+  private final int normalDefault;
   private final Context context;
   
   public FixedSpeedTrackPathDescriptor(Context context) {
 	
     this.context = context;
+    slowDefault = Integer.parseInt(context.getString(R.string.color_mode_fixed_slow_default));
+    normalDefault = Integer.parseInt(context.getString(R.string.color_mode_fixed_medium_default));
+    
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     if (prefs == null) {
-      slowSpeed = 9; 
-      normalSpeed = 17;
+      slowSpeed = slowDefault; 
+      normalSpeed = normalDefault;
       return;
     }
     prefs.registerOnSharedPreferenceChangeListener(this);
     
     try {
       slowSpeed = Integer.parseInt(prefs.getString(context.getString(
-          R.string.track_color_mode_fixed_speed_slow_key), "9"));
+          R.string.track_color_mode_fixed_speed_slow_key), slowDefault + ""));
     } catch (NumberFormatException e) {
-      slowSpeed = 9;
+      slowSpeed = slowDefault;
     }
     
     try {
       normalSpeed = Integer.parseInt(prefs.getString(context.getString(
-          R.string.track_color_mode_fixed_speed_medium_key), "17")); 
+          R.string.track_color_mode_fixed_speed_medium_key), normalDefault + "")); 
     } catch (NumberFormatException e) {
-      normalSpeed = 17;
+      normalSpeed = normalDefault;
     }
   }
   
@@ -90,22 +95,22 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     if (prefs == null) {
-      slowSpeed = 9; 
-      normalSpeed = 17;
+      slowSpeed = slowDefault; 
+      normalSpeed = normalDefault;
       return;
     }
     
     try {
       slowSpeed = Integer.parseInt(prefs.getString(context.getString(
-	    R.string.track_color_mode_fixed_speed_slow_key), "9"));
+	    R.string.track_color_mode_fixed_speed_slow_key), slowDefault + ""));
     } catch (NumberFormatException e) {
-      slowSpeed = 9;
+      slowSpeed = slowDefault;
     }
     try {
       normalSpeed = Integer.parseInt(prefs.getString(context.getString(
-	    R.string.track_color_mode_fixed_speed_medium_key), "17"));
+	    R.string.track_color_mode_fixed_speed_medium_key), normalDefault + ""));
     } catch (NumberFormatException e) {
-      normalSpeed = 17;
+      normalSpeed = normalDefault;
     }
   }