Merge branch 'dev'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml

1 files changed, 21 insertions, 8 deletions

diff --git a/src/net/cbaines/suma/PreferencesActivity.java b/src/net/cbaines/suma/PreferencesActivity.java
index b7c1d89..d72d266 100644
--- a/src/net/cbaines/suma/PreferencesActivity.java
+++ b/src/net/cbaines/suma/PreferencesActivity.java
@@ -19,21 +19,34 @@
 
 package net.cbaines.suma;
 
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 
-public class PreferencesActivity extends PreferenceActivity {
-    boolean CheckboxPreference;
-    String ListPreference;
-    String editTextPreference;
-    String ringtonePreference;
-    String secondEditTextPreference;
-    String customPref;
+public class PreferencesActivity extends PreferenceActivity implements Preferences {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
+
+	final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+	final Editor editor = sharedPrefs.edit();
+	if (!sharedPrefs.contains(GPS_ENABLED)) {
+	    editor.putBoolean(GPS_ENABLED, GPS_ENABLED_BY_DEFAULT);
+	}
+	if (!sharedPrefs.contains(UNI_LINK_BUS_TIMES)) {
+	    editor.putBoolean(UNI_LINK_BUS_TIMES, UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT);
+	}
+	if (!sharedPrefs.contains(NON_UNI_LINK_BUS_TIMES)) {
+	    editor.putBoolean(NON_UNI_LINK_BUS_TIMES, NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT);
+	}
+	if (!sharedPrefs.contains(NON_UNI_LINK_BUS_STOPS_OVERLAY)) {
+	    editor.putBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY, NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT);
+	}
+	editor.commit();
+
 	addPreferencesFromResource(R.xml.preferences);
     }
-
 }
\ No newline at end of file