Merging Sandor's changes with backup (non-trivial merge)

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

@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,26 +39,6 @@ public class MyTracksSettings extends PreferenceActivity {
 
   public static final String SETTINGS_NAME = "MyTracksSettings";
 
-  public static final String ANNOUNCEMENT_FREQUENCY = "announcementFrequency";
-  public static final String DEFAULT_MAP_PUBLIC = "defaultMapPublic";
-  public static final String MAX_RECORDING_DISTANCE = "maxRecordingDistance";
-  public static final String METRIC_UNITS = "metricUnits";
-  public static final String MIN_RECORDING_DISTANCE = "minRecordingDistance";
-  public static final String MIN_RECORDING_INTERVAL = "minRecordingInterval";
-  public static final String MIN_REQUIRED_ACCURACY = "minRequiredAccuracy";
-  public static final String PICK_EXISTING_MAP = "pickExistingMap";
-  public static final String RECORDING_TRACK = "recordingTrack";
-  public static final String REPORT_SPEED = "reportSpeed";
-  public static final String SELECTED_TRACK = "selectedTrack";
-  public static final String SEND_STATS_AND_POINTS = "sendStatsAndPoints";
-  public static final String SEND_TO_DOCS = "sendToDocs";
-  public static final String SEND_TO_MYMAPS = "sendToMyMaps";
-  public static final String SHARE_URL_ONLY = "shareUrlOnly";
-  public static final String SIGNAL_SAMPLING_FREQUENCY =
-      "signalSamplingFrequency";
-  public static final String SPLIT_FREQUENCY = "splitFrequency";
-  public static final String WRITE_TO_SD_CARD = "writeToSdCard";
-
   /*
    * Default values - keep in sync with those in preferences.xml.
    */
@@ -98,7 +78,7 @@ public class MyTracksSettings extends PreferenceActivity {
     // Hook up switching of displayed list entries between metric and imperial
     // units
     CheckBoxPreference metricUnitsPreference =
-        (CheckBoxPreference) findPreference(METRIC_UNITS);
+        (CheckBoxPreference) findPreference(getString(R.string.metric_units_key));
     metricUnitsPreference.setOnPreferenceChangeListener(
         new OnPreferenceChangeListener() {
           @Override
@@ -114,7 +94,8 @@ public class MyTracksSettings extends PreferenceActivity {
     // Disable TTS announcement preference if not available
     if (!mTTSAvailable) {
       IntegerListPreference announcementFrequency =
-          (IntegerListPreference) findPreference(ANNOUNCEMENT_FREQUENCY);
+          (IntegerListPreference) findPreference(
+              getString(R.string.announcement_frequency_key));
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue("-1");
       announcementFrequency.setSummary(
@@ -123,14 +104,14 @@ public class MyTracksSettings extends PreferenceActivity {
 
     // Disable cloud backup options if not supported
     if (MyTracksConstants.ANDROID_API_LEVEL < 8) {
-      // TODO: Merge by moving pref names to XML
-      CheckBoxPreference cloudBackupPreference = (CheckBoxPreference) findPreference("backupToCloud");
+      CheckBoxPreference cloudBackupPreference =
+          (CheckBoxPreference) findPreference(getString(R.string.backup_to_cloud_key));
       cloudBackupPreference.setEnabled(false);
       cloudBackupPreference.setChecked(false);
       cloudBackupPreference.setSummaryOff(R.string.settings_not_available_summary);
     }
 
-    Preference backupNowPreference = findPreference("backupToSd");
+    Preference backupNowPreference = findPreference(getString(R.string.backup_to_sd_key));
     backupNowPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
       @Override
       public boolean onPreferenceClick(Preference preference) {
@@ -140,7 +121,7 @@ public class MyTracksSettings extends PreferenceActivity {
       }
     });
 
-    Preference restoreNowPreference = findPreference("restoreFromSd");
+    Preference restoreNowPreference = findPreference(getString(R.string.restore_from_sd_key));
     restoreNowPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
       @Override
       public boolean onPreferenceClick(Preference preference) {
@@ -159,13 +140,17 @@ public class MyTracksSettings extends PreferenceActivity {
    */
   private void updatePreferenceUnits(boolean isMetric) {
     final ListPreference minRecordingDistance =
-        (ListPreference) findPreference(MIN_RECORDING_DISTANCE);
+        (ListPreference) findPreference(
+            getString(R.string.min_recording_distance_key));
     final ListPreference maxRecordingDistance =
-        (ListPreference) findPreference(MAX_RECORDING_DISTANCE);
+        (ListPreference) findPreference(
+            getString(R.string.max_recording_distance_key));
     final ListPreference minRequiredAccuracy =
-        (ListPreference) findPreference(MIN_REQUIRED_ACCURACY);
+        (ListPreference) findPreference(
+            getString(R.string.min_required_accuracy_key));
     final ListPreference splitFrequency =
-        (ListPreference) findPreference(SPLIT_FREQUENCY);
+        (ListPreference) findPreference(
+            getString(R.string.split_frequency_key));
 
     minRecordingDistance.setEntries(isMetric
         ? R.array.min_recording_distance_options