Add a Photo Size option in Advanced settings

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

@@ -17,21 +17,23 @@
 package com.google.android.apps.mytracks.settings;
 
 import com.google.android.apps.mytracks.util.DialogUtils;
+import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
 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;
 
 /**
- * An activity for accessing the sharing settings.
+ * An activity for advanced settings.
  * 
  * @author Jimmy Shih
  */
-public class SharingSettingsActivity extends AbstractSettingsActivity {
+public class AdvancedSettingsActivity extends AbstractSettingsActivity {
 
   private static final int DIALOG_CONFIRM_ALLOW_ACCESS_ID = 0;
 
@@ -41,7 +43,7 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.sharing_settings);
+    addPreferencesFromResource(R.xml.advanced_settings);
 
     allowAccessCheckBoxPreference = (CheckBoxPreference) findPreference(
         getString(R.string.allow_access_key));
@@ -56,6 +58,15 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
         }
       }
     });
+
+    ListPreference preference = (ListPreference) findPreference(getString(R.string.photo_size_key));
+    int value = PreferencesUtils.getInt(
+        this, R.string.photo_size_key, PreferencesUtils.PHOTO_SIZE_DEFAULT);
+    String[] values = getResources().getStringArray(R.array.photo_size_values);
+    String[] options = new String[values.length];
+    String[] summary = new String[values.length];
+    setPhotoSizeSummaryAndOptions(summary, options, values);
+    configureListPreference(preference, summary, options, values, String.valueOf(value), null);
   }
 
   @Override
@@ -73,4 +84,21 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
           }
         });
   }
+
+  private void setPhotoSizeSummaryAndOptions(String[] summary, String[] options, String[] values) {
+    for (int i = 0; i < values.length; i++) {
+      int value = Integer.parseInt(values[i]);
+      if (value == -1) {
+        options[i] = getString(R.string.settings_advanced_photo_size_original);
+        summary[i] = getString(R.string.settings_advanced_photo_size_original);
+      } else if (value < 1024) {
+        options[i] = getString(R.string.value_integer_kilobyte, value);
+        summary[i] = getString(R.string.settings_advanced_photo_size_summary, options[i]);
+      } else {
+        int megabyte = value / 1024;
+        options[i] = getString(R.string.value_integer_megabyte, megabyte);
+        summary[i] = getString(R.string.settings_advanced_photo_size_summary, options[i]);
+      }
+    }
+  }
 }

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

@@ -43,9 +43,9 @@ public class SettingsActivity extends AbstractSettingsActivity {
     configPreference(R.string.settings_chart_key, ChartSettingsActivity.class);
     configPreference(R.string.settings_stats_key, StatsSettingsActivity.class);
     configPreference(R.string.settings_recording_key, RecordingSettingsActivity.class);
-    configPreference(R.string.settings_sharing_key, SharingSettingsActivity.class);
     configPreference(R.string.settings_sensor_key, SensorSettingsActivity.class);
     configPreference(R.string.settings_backup_reset_key, BackupResetSettingsActivity.class);
+    configPreference(R.string.settings_advanced_key, AdvancedSettingsActivity.class);
   }
 
   /**