Merge heads

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

@@ -36,13 +36,13 @@ public class AbstractSettingsActivity extends PreferenceActivity {
 
   private BackupPreferencesListener backupPreferencesListener;
 
+  @SuppressWarnings("deprecation")
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
     ApiAdapterFactory.getApiAdapter().configureActionBarHomeAsUp(this);
 
-    @SuppressWarnings("deprecation")
     PreferenceManager preferenceManager = getPreferenceManager();
     preferenceManager.setSharedPreferencesName(Constants.SETTINGS_NAME);
     preferenceManager.setSharedPreferencesMode(Context.MODE_PRIVATE);
@@ -63,10 +63,10 @@ public class AbstractSettingsActivity extends PreferenceActivity {
     return true;
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   protected void onDestroy() {
     super.onDestroy();
-    @SuppressWarnings("deprecation")
     PreferenceManager preferenceManager = getPreferenceManager();
     preferenceManager.getSharedPreferences()
         .unregisterOnSharedPreferenceChangeListener(backupPreferencesListener);

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

@@ -39,14 +39,6 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
     boolean metricUnits = PreferencesUtils.getBoolean(
         this, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
 
-    ListPreference announcementFrequencyListPreference = (ListPreference) findPreference(
-        getString(R.string.announcement_frequency_key));
-    announcementFrequencyListPreference.setEntries(getPeriodicTaskDisplayOptions(metricUnits));
-
-    ListPreference splitFrequencyListPreference = (ListPreference) findPreference(
-        getString(R.string.split_frequency_key));
-    splitFrequencyListPreference.setEntries(getPeriodicTaskDisplayOptions(metricUnits));
-
     ListPreference minRecordingIntervalListPreference = (ListPreference) findPreference(
         getString(R.string.min_recording_interval_key));
     minRecordingIntervalListPreference.setEntries(getMinRecordingIntervalDisplayOptions());
@@ -70,28 +62,6 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
     autoResumeTrackTimeoutListPreference.setEntries(getAutoResumeTrackTimeoutDisplayOptions());
   }
 
-  /**
-   * Gets the periodic task display options.
-   * 
-   * @param metricUnits true to display metric units
-   */
-  private String[] getPeriodicTaskDisplayOptions(boolean metricUnits) {
-    String[] values = getResources().getStringArray(R.array.periodic_task_values);
-    String[] options = new String[values.length];
-    for (int i = 0; i < values.length; i++) {
-      int value = Integer.parseInt(values[i]);
-      if (value == PreferencesUtils.PERIODIC_TASK_OFF) {
-        options[i] = getString(R.string.value_off);
-      } else if (value < 0) {
-        options[i] = getString(metricUnits ? R.string.value_integer_kilometer
-            : R.string.value_integer_mile, Math.abs(value));
-      } else {
-        options[i] = getString(R.string.value_integer_minute, value);
-      }
-    }
-    return options;
-  }
-
   /**
    * Gets the min recording interval display options.
    */

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

@@ -120,8 +120,8 @@ public class SensorSettingsActivity extends AbstractSettingsActivity {
   /**
    * Updates the bluetooth sensor list preference.
    */
+  @SuppressWarnings("deprecation")
   private void updateBluetoothSensorListPreference() {
-    @SuppressWarnings("deprecation")
     ListPreference bluetoothSensorListPreference = (ListPreference) findPreference(
         getString(R.string.bluetooth_sensor_key));
     List<String> entries = new ArrayList<String>();

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

@@ -16,16 +16,23 @@
 
 package com.google.android.apps.mytracks.settings;
 
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.util.DialogUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * An activity for accessing the sharing settings.
  * 
@@ -56,6 +63,21 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
         }
       }
     });
+    
+    ListPreference sharingAccountListPreference = (ListPreference) findPreference(
+        getString(R.string.sharing_account_key));
+    List<String> entries = new ArrayList<String>();
+    Account[] accounts = AccountManager.get(this).getAccountsByType(Constants.ACCOUNT_TYPE);
+    for (Account account : accounts) {
+      entries.add(account.name);
+    }
+    
+    sharingAccountListPreference.setEntries(entries.toArray(new CharSequence[entries.size()]));
+    sharingAccountListPreference.setEntryValues(entries.toArray(
+        new CharSequence[entries.size()]));
+    if (entries.size() == 1) {
+      sharingAccountListPreference.setValueIndex(0);
+    }
   }
 
   @Override