Use list preference for chart x axis settings

MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java

@@ -305,8 +305,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
    */
   private void checkChartSettings() {
     boolean needUpdate = false;
-    if (chartByDistance != PreferencesUtils.getBoolean(getActivity(),
-        R.string.chart_by_distance_key, PreferencesUtils.CHART_BY_DISTANCE_DEFAULT)) {
+    if (chartByDistance != PreferencesUtils.isChartByDistance(getActivity())) {
       chartByDistance = !chartByDistance;
       chartView.setChartByDistance(chartByDistance);
       reloadTrackDataHub();

MyTracks/src/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java

@@ -21,6 +21,7 @@ import com.google.android.maps.mytracks.R;
 
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 
 /**
  * An activity for accessing chart settings.
@@ -34,6 +35,7 @@ public class ChartSettingsActivity extends AbstractSettingsActivity {
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
     addPreferencesFromResource(R.xml.chart_settings);
+    configXAxisListPreference();
   }
 
   @Override
@@ -46,8 +48,21 @@ public class ChartSettingsActivity extends AbstractSettingsActivity {
   private void updateUi() {
     CheckBoxPreference speedCheckBoxPreference = (CheckBoxPreference) findPreference(
         getString(R.string.chart_show_speed_key));
-    boolean reportSpeed = PreferencesUtils.isReportSpeed(this);
-    speedCheckBoxPreference.setTitle(reportSpeed ? R.string.stats_speed
-        : R.string.stats_pace);
+    speedCheckBoxPreference.setTitle(
+        PreferencesUtils.isReportSpeed(this) ? R.string.stats_speed : R.string.stats_pace);
+  }
+
+  /**
+   * Configures the x axis list preference.
+   */
+  private void configXAxisListPreference() {
+    @SuppressWarnings("deprecation")
+    ListPreference listPreference = (ListPreference) findPreference(
+        getString(R.string.chart_x_axis_key));
+    String value = PreferencesUtils.getString(
+        this, R.string.chart_x_axis_key, PreferencesUtils.CHART_X_AXIS_DEFAULT);
+    String[] values = getResources().getStringArray(R.array.chart_x_axis_values);
+    String[] options = getResources().getStringArray(R.array.chart_x_axis_options);
+    configureListPreference(listPreference, options, options, values, value, null);
   }
 }

MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java

@@ -50,12 +50,12 @@ public class PreferencesUtils {
 
   public static final String BLUETOOTH_SENSOR_DEFAULT = "";
   
-  public static final boolean CHART_BY_DISTANCE_DEFAULT = true;
   public static final boolean CHART_SHOW_CADENCE_DEFAULT = true;
   public static final boolean CHART_SHOW_ELEVATION_DEFAULT = true;
   public static final boolean CHART_SHOW_HEART_RATE_DEFAULT = true;
   public static final boolean CHART_SHOW_POWER_DEFAULT = true;
   public static final boolean CHART_SHOW_SPEED_DEFAULT = true;
+  public static final String CHART_X_AXIS_DEFAULT = "DISTANCE";
 
   public static final boolean CONFIRM_PLAY_EARTH_DEFAULT = true;
 
@@ -257,9 +257,10 @@ public class PreferencesUtils {
     return PreferencesUtils.STATS_UNITS_DEFAULT.equals(
         getString(context, R.string.stats_units_key, PreferencesUtils.STATS_UNITS_DEFAULT));
   }
-  
+
   /**
-   * Returns true if the preferred rate is speed, false if the preferred rate is pace.
+   * Returns true if the preferred rate is speed, false if the preferred rate is
+   * pace.
    * 
    * @param context the context
    */
@@ -267,4 +268,14 @@ public class PreferencesUtils {
     return PreferencesUtils.STATS_RATE_DEFAULT.equals(
         getString(context, R.string.stats_rate_key, PreferencesUtils.STATS_RATE_DEFAULT));
   }
+
+  /**
+   * Returns true if chart x axis is by distance, false if by time.
+   * 
+   * @param context the context
+   */
+  public static boolean isChartByDistance(Context context) {
+    return PreferencesUtils.CHART_X_AXIS_DEFAULT.equals(
+        getString(context, R.string.chart_x_axis_key, PreferencesUtils.CHART_X_AXIS_DEFAULT));
+  }
 }