From d96aefe4fee802d524f71d5042d626acb69d5b2f Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 25 Sep 2013 23:31:36 -0500
Subject: [PATCH] Remove astrid lite, set configuration preference

---
 .../astrid/activity/EditPreferences.java      |  50 ++-----
 .../astrid/service/StatisticsConstants.java   |   2 -
 .../astrid/service/UpgradeService.java        |   3 -
 .../utility/AstridLitePreferenceSpec.java     | 122 ------------------
 .../astrid/utility/AstridPreferences.java     |  15 +--
 .../com/todoroo/astrid/utility/Constants.java |   5 -
 astrid/src/main/res/values-de/strings.xml     |   4 -
 astrid/src/main/res/values-es/strings.xml     |   4 -
 astrid/src/main/res/values-fr/strings.xml     |   6 -
 astrid/src/main/res/values-iw/strings.xml     |   6 -
 astrid/src/main/res/values-ko/strings.xml     |   6 -
 astrid/src/main/res/values-nl/strings.xml     |   5 -
 astrid/src/main/res/values-pl/strings.xml     |   5 -
 astrid/src/main/res/values-ru/strings.xml     |   5 -
 astrid/src/main/res/values-uk/strings.xml     |   2 -
 astrid/src/main/res/values/keys.xml           |   9 +-
 astrid/src/main/res/values/strings-core.xml   |  13 --
 astrid/src/main/res/xml/preferences.xml       |   6 -
 18 files changed, 14 insertions(+), 254 deletions(-)
 delete mode 100644 astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
index 7740f8b09..e930cda36 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
@@ -27,7 +21,6 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -47,13 +40,9 @@ import com.todoroo.astrid.helper.MetadataHelper;
 import com.todoroo.astrid.service.AddOnService;
 import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy;
 import com.todoroo.astrid.service.StartupService;
-import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.sync.SyncProviderPreferences;
 import com.todoroo.astrid.ui.TaskListFragmentPager;
-import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec;
-import com.todoroo.astrid.utility.AstridLitePreferenceSpec;
-import com.todoroo.astrid.utility.AstridPreferenceSpec;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
@@ -61,6 +50,14 @@ import com.todoroo.astrid.voice.VoiceOutputService;
 import com.todoroo.astrid.voice.VoiceRecognizer;
 import com.todoroo.astrid.widget.TasksWidget;
 
+import org.tasks.R;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Displays the preference screen for users to edit their preferences
  *
@@ -106,31 +103,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
         }
     }
 
-    private class SetDefaultsClickListener implements OnPreferenceClickListener {
-        private final AstridPreferenceSpec spec;
-        private final int nameId;
-        private final String statistic;
-        public SetDefaultsClickListener(AstridPreferenceSpec spec, int nameId, String statistic) {
-            this.spec = spec;
-            this.nameId = nameId;
-            this.statistic = statistic;
-        }
-
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            DialogUtilities.okCancelDialog(EditPreferences.this, getString(R.string.EPr_config_dialog_title),
-                    getString(R.string.EPr_config_dialog_text, getString(nameId)), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            spec.resetDefaults();
-                            setResult(RESULT_CODE_PERFORMANCE_PREF_CHANGED);
-                            finish();
-                        }
-                    }, null);
-            return true;
-        }
-    }
-
     @Override
     public int getPreferenceResource() {
         return R.xml.preferences;
@@ -498,12 +470,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         findPreference(getString(R.string.p_hide_plus_button)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
-        findPreference(getString(R.string.p_config_default)).setOnPreferenceClickListener(
-                new SetDefaultsClickListener(new AstridDefaultPreferenceSpec(), R.string.EPr_config_dialog_default_id, StatisticsConstants.PREFS_RESET_DEFAULT));
-
-        findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener(
-                new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite, StatisticsConstants.PREFS_RESET_LITE));
-
         int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_sync, R.string.p_show_menu_sort,
         };
         for (int key : menuPrefs) {
diff --git a/astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java b/astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java
index 76fc57057..57f055196 100644
--- a/astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java
+++ b/astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java
@@ -71,8 +71,6 @@ public class StatisticsConstants {
     public static final String PREMIUM_PAGE_VIEWED = "premium-page-viewed";
     public static final String FEATURED_LIST_CLONED = "featured-list-cloned";
     public static final String RANDOM_REMINDER_SAVED = "random-rmdr-save";
-    public static final String PREFS_RESET_DEFAULT = "prefs-reset-default";
-    public static final String PREFS_RESET_LITE = "prefs-reset-lite";
 
     public static final String ACTFM_LOGIN_SIMPLE = "actfm-login-simple";
     public static final String ACTFM_LOGIN_SIMPLE_REJECTED = "actfm-login-simple-rejected";
diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java
index 4ea2b5d13..d86b352b8 100644
--- a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java
@@ -791,9 +791,6 @@ public final class UpgradeService {
      * @param changes
      */
     private void newVersionString(StringBuilder changeLog, String version, String[] changes) {
-        if (Constants.ASTRID_LITE) {
-            version = "0" + version.substring(1);
-        }
         changeLog.append("<font style='text-align: center; color=#ffaa00'><b>Version ").append(version).append(":</b></font><br><ul>");
         for(String change : changes) {
             changeLog.append("<li>").append(change).append("</li>\n");
diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
deleted file mode 100644
index 3dba2c2c9..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.todoroo.astrid.utility;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.res.Resources;
-
-import org.tasks.R;
-import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.activity.BeastModePreferences;
-import com.todoroo.astrid.core.SortHelper;
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.service.ThemeService;
-import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec.PreferenceExtras;
-
-public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
-
-    @Override
-    public void setIfUnset() {
-        PreferenceExtras extras = new PreferenceExtras() {
-            @Override
-            public void setExtras(Context context, SharedPreferences prefs, Editor editor, Resources r, boolean ifUnset) {
-                String dragDropTestInitialized = "android_drag_drop_initialized"; //$NON-NLS-1$
-                if (!Preferences.getBoolean(dragDropTestInitialized, false)) {
-                    SharedPreferences publicPrefs = AstridPreferences.getPublicPrefs(context);
-                    if (publicPrefs != null) {
-                        Editor edit = publicPrefs.edit();
-                        if (edit != null) {
-                            edit.putInt(SortHelper.PREF_SORT_FLAGS, SortHelper.FLAG_DRAG_DROP);
-                            edit.putInt(SortHelper.PREF_SORT_SORT, SortHelper.SORT_AUTO);
-                            edit.commit();
-                            Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
-                        }
-                    }
-                    Preferences.setBoolean(dragDropTestInitialized, true);
-                }
-
-                BeastModePreferences.setDefaultLiteModeOrder(context, false);
-            }
-        };
-
-        setPrefs(extras, true);
-    }
-
-    @Override
-    public void resetDefaults() {
-        PreferenceExtras extras = new PreferenceExtras() {
-            @Override
-            public void setExtras(Context context, SharedPreferences prefs, Editor editor, Resources r, boolean ifUnset) {
-                SharedPreferences publicPrefs = AstridPreferences.getPublicPrefs(context);
-                if (publicPrefs != null) {
-                    Editor edit = publicPrefs.edit();
-                    if (edit != null) {
-                        edit.putInt(SortHelper.PREF_SORT_FLAGS, SortHelper.FLAG_DRAG_DROP);
-                        edit.putInt(SortHelper.PREF_SORT_SORT, SortHelper.SORT_AUTO);
-                        edit.commit();
-                        Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
-                    }
-                }
-                BeastModePreferences.setDefaultLiteModeOrder(context, true);
-            }
-        };
-
-        setPrefs(extras, false);
-    }
-
-    private static void setPrefs(PreferenceExtras extras, boolean ifUnset) {
-        Context context = ContextManager.getContext();
-        SharedPreferences prefs = Preferences.getPrefs(context);
-        Editor editor = prefs.edit();
-        Resources r = context.getResources();
-
-        setPreference(prefs, editor, r, R.string.p_default_urgency_key, 4, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_default_importance_key, 2, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_default_hideUntil_key, 0, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_default_reminders_mode_key, 16, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_rmd_default_random_hours, 0, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_fontSize, 20, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_showNotes, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_field_missed_calls, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_end_at_deadline, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_rmd_persistent, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_calendar_reminders, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_ALT, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_show_menu_search, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_menu_sync, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_show_quickadd_controls, true, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_taskRowStyle_v2, "2", ifUnset); //$NON-NLS-1$
-
-        setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
-
-        setPreference(prefs, editor, r, R.string.p_hide_plus_button, true, ifUnset);
-
-        extras.setExtras(context, prefs, editor, r, ifUnset);
-
-        editor.commit();
-    }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java
index dae9d1c45..014f3be42 100644
--- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java
@@ -9,7 +9,6 @@ package com.todoroo.astrid.utility;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Query;
@@ -21,6 +20,8 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.UpgradeService;
 import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
 
+import org.tasks.R;
+
 public class AstridPreferences {
 
     private static final String P_CURRENT_VERSION = "cv"; //$NON-NLS-1$
@@ -44,11 +45,7 @@ public class AstridPreferences {
     /** Set preference defaults, if unset. called at startup */
     public static void setPreferenceDefaults() {
         AstridPreferenceSpec spec;
-        if (Constants.ASTRID_LITE) {
-            spec = new AstridLitePreferenceSpec();
-        } else {
-            spec = new AstridDefaultPreferenceSpec();
-        }
+        spec = new AstridDefaultPreferenceSpec();
 
         spec.setIfUnset();
 
@@ -60,11 +57,7 @@ public class AstridPreferences {
 
     public static void resetToDefaults() {
         AstridPreferenceSpec spec;
-        if (Constants.ASTRID_LITE) {
-            spec = new AstridLitePreferenceSpec();
-        } else {
-            spec = new AstridDefaultPreferenceSpec();
-        }
+        spec = new AstridDefaultPreferenceSpec();
 
         spec.resetDefaults();
     }
diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
index 9c4aecef7..a0af09dfa 100644
--- a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
@@ -37,11 +37,6 @@ public final class Constants {
      */
     public static final boolean DEBUG = false;
 
-    /**
-     * Whether this version is Astrid Lite
-     */
-    public static final boolean ASTRID_LITE = false;
-
     /**
      * Astrid Help URL
      */
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index 6df587cc5..5341e4342 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -311,10 +311,6 @@
 	<string name="EPr_taskRowPrefs_title">Aussehen der Aufgabenzeilen</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Zeitpunkt Kalendertermin</string>
 	<string name="EPr_force_phone_layout">Telefon Layout nutzen</string>
-	<string name="EPr_configurations_title">Einstellen</string>
-	<string name="EPr_config_default">Standard</string>
-	<string name="EPr_config_dialog_title">Einstellen?</string>
-	<string name="EPr_config_dialog_default_id">Standard</string>
 	<string name="EPr_show_save_and_cancel">Zeige speichern und abbrechen</string>
 	<string name="EPr_swipe_lists_performance_title">Zum Wechseln der Listen \"wischen\"</string>
 	<string name="swipe_lists_helper_title">Zum Wechseln der Listen wischen</string>
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index 9a6358d87..e7c8191c3 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -314,10 +314,6 @@
 	<string name="EPr_theme_widget_title">Tema del widget</string>
 	<string name="EPr_taskRowPrefs_title">Apariencia de la fila de tareas</string>
 	<string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
-	<string name="EPr_configurations_title">Definir configuración</string>
-	<string name="EPr_config_default">Predeterminado</string>
-	<string name="EPr_config_dialog_title">¿Definir configuración?</string>
-	<string name="EPr_config_dialog_default_id">predeterminado</string>
 	<string name="EPr_swipe_lists_performance_title">Deslizar entre las listas</string>
 	<string name="swipe_lists_helper_title">Deslizar entre listas</string>
 	<string name="swipe_lists_helper_header">Deslizar a izquierda o derecha para moverse rápidamente entre listas</string>
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index eb2dd048a..df3a4c8c7 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -316,12 +316,6 @@
 	<string name="EPr_cal_end_at_due_time">Terminer les événements dans le calendrier à l\'échéance</string>
 	<string name="EPr_cal_start_at_due_time">Commencer les événements dans le calendrier à l\'échéance</string>
 	<string name="EPr_force_phone_layout">Utiliser la mise en page du téléphone</string>
-	<string name="EPr_configurations_title">Configurer</string>
-	<string name="EPr_config_default">Par défaut</string>
-	<string name="EPr_config_lite">Tâches allégées</string>
-	<string name="EPr_config_dialog_title">Configurer?</string>
-	<string name="EPr_config_dialog_text">Réinitialiser les préférences de la configuration %s?</string>
-	<string name="EPr_config_dialog_default_id">Par défaut</string>
 	<string name="EPr_show_save_and_cancel">Afficher enregistrer et annuler</string>
 	<string name="EPr_swipe_lists_performance_title">Glisser entre les listes.</string>
 	<string name="swipe_lists_helper_title">Glisser entre les listes.</string>
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index f215a239b..951c72cb5 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -306,12 +306,6 @@
 	<string name="EPr_cal_end_at_due_time">סיים את אירועי היומן במועד היעד?</string>
 	<string name="EPr_cal_start_at_due_time">התחל את מאורעות היומן במועד היעד</string>
 	<string name="EPr_force_phone_layout">מקלדת טלפון</string>
-	<string name="EPr_configurations_title">קביעת קונפיגורציה</string>
-	<string name="EPr_config_default">מחדל</string>
-	<string name="EPr_config_lite">אסטריד לייט</string>
-	<string name="EPr_config_dialog_title">לקבוע קונפיגורציה?</string>
-	<string name="EPr_config_dialog_text">שחזר את כל ההעדפות לקונפיגורציה %s?</string>
-	<string name="EPr_config_dialog_default_id">מחדל</string>
 	<string name="EPr_swipe_lists_performance_title">עִלְעוּל בין רשימות</string>
 	<string name="swipe_lists_helper_title">עִלְעוּל בין רשימות</string>
 	<string name="swipe_lists_helper_header">עִלְעוּל ימינה ושמאלה למעבר מהיר בין רשימות</string>
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index 5f4fe2d55..7da9a2c3e 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -325,12 +325,6 @@
 	<string name="EPr_cal_end_at_due_time">설정한 시간에 달력 이벤트 종료</string>
 	<string name="EPr_cal_start_at_due_time">설정한 시간에 달력 이벤트 시작</string>
 	<string name="EPr_force_phone_layout">스마트폰의 레이아웃 사용하기</string>
-	<string name="EPr_configurations_title">환경 설정하기</string>
-	<string name="EPr_config_default">기본값</string>
-	<string name="EPr_config_lite">아스트리드 라이트</string>
-	<string name="EPr_config_dialog_title">환경을 설정할까요?</string>
-	<string name="EPr_config_dialog_text">설정을 %s 환경으로 초기화할까요?</string>
-	<string name="EPr_config_dialog_default_id">기본값</string>
 	<string name="EPr_show_save_and_cancel">저장과 취소 보이기</string>
 	<string name="EPr_swipe_lists_performance_title">목록간 스와이프 이동하기</string>
 	<string name="swipe_lists_helper_title">목록간 스와이프 이동하기</string>
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index 9ebf85947..cea9c9ba2 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -318,11 +318,6 @@
 	<string name="EPr_cal_end_at_due_time">Agenda item op tijd afronden</string>
 	<string name="EPr_cal_start_at_due_time">Agenda item op tijd starten</string>
 	<string name="EPr_force_phone_layout">Gebruik telefoon layout</string>
-	<string name="EPr_configurations_title">Configuratie instellen</string>
-	<string name="EPr_config_default">Standaard</string>
-	<string name="EPr_config_dialog_title">Configuratie instellen?</string>
-	<string name="EPr_config_dialog_text">Reset voorkeuren naar de %s configuratie?</string>
-	<string name="EPr_config_dialog_default_id">standaard</string>
 	<string name="EPr_show_save_and_cancel">Toon opslaan en annuleren</string>
 	<string name="EPr_swipe_lists_performance_title">Swipe tussen lijsten</string>
 	<string name="swipe_lists_helper_title">Swipe tussen lijsten</string>
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index f751b7e38..8210d0f36 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -311,11 +311,6 @@
 	<string name="EPr_cal_end_at_due_time">Zakończ zadania kalendarza w ustalonym czasie</string>
 	<string name="EPr_cal_start_at_due_time">Rozpocznij zadania kalendarza w ustalonym czasie</string>
 	<string name="EPr_force_phone_layout">Używaj wyglądu komórkowego</string>
-	<string name="EPr_configurations_title">Konfiguruj</string>
-	<string name="EPr_config_default">Domyślny</string>
-	<string name="EPr_config_dialog_title">Ustawić konfigurację?</string>
-	<string name="EPr_config_dialog_text">Zresetować ustawienia do konfiguracji %s?</string>
-	<string name="EPr_config_dialog_default_id">domyślny</string>
 	<string name="EPr_show_save_and_cancel">Pokaż przyciski zapisz i anuluj</string>
 	<string name="EPr_swipe_lists_performance_title">Przejedź pomiędzy listami</string>
 	<string name="swipe_lists_helper_title">Przeciągaj pomiędzy listami</string>
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index 23ca8a6df..6330a1553 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -310,11 +310,6 @@
 	<string name="EPr_cal_end_or_start_at_due_time">Время события в календаре</string>
 	<string name="EPr_cal_end_at_due_time">Завершение события при наступлении срока</string>
 	<string name="EPr_force_phone_layout">Использовать режим телефона</string>
-	<string name="EPr_config_default">По умолчанию</string>
-	<string name="EPr_config_lite">Tasks простая версия</string>
-	<string name="EPr_config_dialog_title">Установить конфигурацию?</string>
-	<string name="EPr_config_dialog_text">Сбросить настройки до %s</string>
-	<string name="EPr_config_dialog_default_id">По умолчанию</string>
 	<string name="EPr_show_save_and_cancel">Показать сохранить и отменить</string>
 	<string name="EPr_swipe_lists_performance_title">Свайп между списками</string>
 	<string name="swipe_lists_helper_title">Свайп между списками</string>
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index 131fcd9ad..ed206fd64 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -286,8 +286,6 @@
 	<string name="EPr_list_view">Вигляд списку</string>
 	<string name="EPr_show_task_edit_comments">Показувати коментарі в редакторі завдання</string>
 	<string name="EPr_taskRowPrefs_title">Зовнішній вигляд завдань у списку</string>
-	<string name="EPr_config_default">Стандартно</string>
-	<string name="EPr_config_dialog_default_id">типовий</string>
 	<string name="EPr_show_save_and_cancel">Показати зберегти і скасувати</string>
 	<string name="EPr_swipe_lists_performance_title">Свайп між списками</string>
 	<string name="swipe_lists_helper_title">Свайп між списками</string>
diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml
index 5ec536490..33d3c4ddb 100644
--- a/astrid/src/main/res/values/keys.xml
+++ b/astrid/src/main/res/values/keys.xml
@@ -91,7 +91,7 @@
     <item>730</item>
     <item>1460</item>
   </string-array>
-    
+
   <string-array name="EPr_reminder_random_hours">
     <!-- values (in hours) associated with random reminders above. -->
     <item>0</item>
@@ -264,12 +264,7 @@
   <string name="p_hide_plus_button">p_hide_plus_button</string>
   
   <string name="p_show_timer_shortcut">p_show_timer_shortcut</string>
-  
-  <!-- Configurations -->
-  <string name="p_configurations">p_configurations</string>
-  <string name="p_config_default">p_config_default</string>
-  <string name="p_config_lite">p_config_lite</string>
-  
+
   <!-- ========================================================= DEFAULTS == -->
   
   <!-- default urgency setting (corresponds to entry in TEA_urgency) -->  
diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml
index f4cf651e0..a22ef15fe 100644
--- a/astrid/src/main/res/values/strings-core.xml
+++ b/astrid/src/main/res/values/strings-core.xml
@@ -671,19 +671,6 @@
   
   <string name="EPr_force_phone_layout">Use phone layout</string>
 
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Tasks Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
   <!-- Preference title for showing save and cancel buttons in task edit page -->
   <string name="EPr_show_save_and_cancel">Show save and cancel </string>
   
diff --git a/astrid/src/main/res/xml/preferences.xml b/astrid/src/main/res/xml/preferences.xml
index d9f6af5b6..d0ee3c8ef 100644
--- a/astrid/src/main/res/xml/preferences.xml
+++ b/astrid/src/main/res/xml/preferences.xml
@@ -155,12 +155,6 @@
 	        android:key="@string/p_force_phone_layout"
 	        android:defaultValue="false"/>
         
-        <PreferenceScreen android:key="@string/p_configurations"
-                          android:title="@string/EPr_configurations_title">
-            <PreferenceScreen android:title="@string/EPr_config_default" android:key="@string/p_config_default" />
-            <PreferenceScreen android:title="@string/EPr_config_lite" android:key="@string/p_config_lite"/>    
-        </PreferenceScreen>
-             
     </PreferenceScreen>
 
 </PreferenceScreen>