From 8d491c5ad53f0ac3095ab10128e2a18e843c4f3c Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 4 Feb 2013 14:59:50 -0800
Subject: [PATCH] Remove date shortcuts test and edit box style test

---
 astrid/res/values/keys.xml                    |  3 ---
 astrid/res/values/styles.xml                  | 27 +------------------
 astrid/res/xml/preferences.xml                |  5 ----
 .../astrid/activity/EditPreferences.java      |  2 --
 .../todoroo/astrid/service/ThemeService.java  | 25 +----------------
 .../astrid/service/abtesting/ABTests.java     | 21 +--------------
 .../utility/AstridDefaultPreferenceSpec.java  |  6 +----
 .../utility/AstridLitePreferenceSpec.java     |  2 --
 8 files changed, 4 insertions(+), 87 deletions(-)

diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index f78d160ad..4d8dd2b70 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -74,9 +74,6 @@
 
   <!-- list view section key -->
   <string name="p_list_view">p_list_view</string>
-
-  <!-- simple input box style -->
-  <string name="p_simple_input_boxes">simple_input_boxes</string>
   
   <!-- filters to show -->
   <string name="p_filters_to_show">p_filters_to_show</string>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 5321f987f..dc035c177 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -27,7 +27,7 @@
         <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asCommentButtonImg">@drawable/comment_blue</item>
         <item name="asFilledCommentButtonImg">@drawable/comment_blue_filled</item>
-        <item name="asEditTextBackground">@drawable/edit_title_background_dark</item>
+        <item name="asEditTextBackground">@null</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
@@ -54,10 +54,6 @@
         <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
     </style>
     
-    <style name="Theme.Simple" parent="Theme">
-        <item name="asEditTextBackground">@null</item>
-    </style>
-    
     <style name="Theme.Transparent" parent="Theme">
 		<item name="asContentBackground">#22000000</item>
         <item name="abBackground">#aa000000</item>
@@ -70,10 +66,6 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
-    
-    <style name="Theme.Transparent.Simple" parent="Theme.Transparent">
-        <item name="asEditTextBackground">@null</item>
-    </style>
         
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
         <item name="asContentBackground">@android:color/white</item>
@@ -92,7 +84,6 @@
         <item name="asCommentButtonImg">@drawable/comment_red</item>
         <item name="asFilledCommentButtonImg">@drawable/comment_red_filled</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
-        <item name="asEditTextBackground">@drawable/edit_title_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_red</item>
@@ -112,10 +103,6 @@
         <item name="abLogo">@drawable/home_button_red</item>
     </style>
     
-    <style name="Theme.White.Simple" parent="Theme.White">
-        <item name="asEditTextBackground">@null</item>
-    </style>
-    
     <style name="Theme.White.Blue">
         <item name="asAddButtonImg">@drawable/plus_button_dark_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_dark_blue</item>
@@ -131,10 +118,6 @@
         <item name="abBackground">@drawable/header_day_blue</item>
         <item name="abLogo">@drawable/home_button_dark_blue</item>
     </style>
-    
-    <style name="Theme.White.Blue.Simple" parent="Theme.White.Blue">
-        <item name="asEditTextBackground">@null</item>
-    </style>
 
     <style name="Theme.White.Alt">
         <item name="asAddButtonImg">@drawable/plus_button_blue</item>
@@ -154,10 +137,6 @@
         <item name="asHeaderTextColorInverse">?attr/asThemeTextColor</item>
     </style>
     
-    <style name="Theme.White.Alt.Simple" parent="Theme.White.Alt">
-        <item name="asEditTextBackground">@null</item>
-    </style>
-    
     <style name="Theme.TransparentWhite" parent="Theme.White.Blue">
         <item name="asContentBackground">#22000000</item>
         <item name="abBackground">#aa000000</item>
@@ -171,10 +150,6 @@
         <item name="android:windowShowWallpaper">true</item>
     </style>
     
-    <style name="Theme.TransparentWhite.Simple" parent="Theme.TransparentWhite">
-        <item name="asEditTextBackground">@null</item>
-    </style>
-    
     <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
         <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index ea85f9947..5a2007cd3 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -177,11 +177,6 @@
 	            android:dependency="@string/p_voiceInputEnabled"
 	            android:defaultValue="false" />
         </PreferenceScreen>
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_simple_input_boxes"
-            android:title="@string/EPr_simple_input_boxes"
-            android:defaultValue="false"/>
         
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_showSmartConfirmation_key"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index ae5ebbc98..8dbf9158a 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -680,8 +680,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
     public void addPreferenceListeners() {
         findPreference(getString(R.string.p_theme)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
-        findPreference(getString(R.string.p_simple_input_boxes)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
-
         findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
         findPreference(getString(R.string.p_config_default)).setOnPreferenceClickListener(
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index da03b083b..c7e6ef638 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -49,11 +49,7 @@ public class ThemeService {
     }
 
     public static int getTheme() {
-        int style = getUnsimplifiedTheme();
-        boolean simple = Preferences.getBoolean(R.string.p_simple_input_boxes, false);
-        if (simple)
-            style = simplifyStyle(style);
-        return style;
+        return getUnsimplifiedTheme();
     }
 
     public static int getUnsimplifiedTheme() {
@@ -86,25 +82,6 @@ public class ThemeService {
             return R.style.Theme_White_Blue;
     }
 
-    private static int simplifyStyle(int original) {
-        switch (original) {
-        case R.style.Theme:
-            return R.style.Theme_Simple;
-        case R.style.Theme_Transparent:
-            return R.style.Theme_Transparent_Simple;
-        case R.style.Theme_TransparentWhite:
-            return R.style.Theme_TransparentWhite_Simple;
-        case R.style.Theme_White:
-            return R.style.Theme_White_Simple;
-        case R.style.Theme_White_Blue:
-            return R.style.Theme_White_Blue_Simple;
-        case R.style.Theme_White_Alt:
-            return R.style.Theme_White_Alt_Simple;
-        default:
-            return original;
-        }
-    }
-
     public static int getThemeColor() {
         int theme = getUnsimplifiedTheme();
         switch(theme) {
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 44a8cb74c..9728a9fa2 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -10,8 +10,6 @@ import java.util.Set;
 
 import android.content.Context;
 
-import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
 /**
@@ -34,14 +32,7 @@ public class ABTests {
      * @param context
      */
     public void externalInit(Context context) {
-        // If test uninitialized, clear preference. This fixes a bug where the old test would not be initialized correctly
-        if (!Constants.ASTRID_LITE && ABChooser.readChoiceForTest(AB_USE_DATE_SHORTCUTS) == ABChooser.NO_OPTION) {
-            Preferences.clear(context.getString(R.string.p_use_date_shortcuts));
-        }
-
-        if (!Constants.ASTRID_LITE && ABChooser.readChoiceForTest(AB_SIMPLE_EDIT_BOXES) == ABChooser.NO_OPTION) {
-            Preferences.clear(context.getString(R.string.p_simple_input_boxes));
-        }
+        //
     }
 
     /**
@@ -145,20 +136,10 @@ public class ABTests {
         }
     }
 
-    public static final String AB_USE_DATE_SHORTCUTS = "android_use_date_shortcuts_v2"; //$NON-NLS-1$
-
     public static final String AB_TITLE_ONLY = "android_title_only"; //$NON-NLS-1$
 
-    public static final String AB_SIMPLE_EDIT_BOXES = "android_simple_edit_boxes"; //$NON-NLS-1$
-
     private void initialize() {
-        addTest(AB_USE_DATE_SHORTCUTS, new int[] { 1, 1 },
-                new int[] { 1, 9 }, new String[] { "date-shortcuts-off", "date-shortcuts-on" }, false); //$NON-NLS-1$ //$NON-NLS-2$
-
         addTest(AB_TITLE_ONLY, new int[] { 9, 1 },
                 new int[] { 1, 0 }, new String[] { "default-row-style", "title-only-style" }, false); //$NON-NLS-1$//$NON-NLS-2$
-
-        addTest(AB_SIMPLE_EDIT_BOXES, new int[] { 1, 1 },
-                new int[] { 9, 1 }, new String[] { "default-box-style", "simple-box-style" }, false); //$NON-NLS-1$//$NON-NLS-2$
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index 64d418721..6a0db734a 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -121,9 +121,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_use_filters, true, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_simple_input_boxes,
-                ABChooser.readChoiceForTest(ABTests.AB_SIMPLE_EDIT_BOXES) != 0, ifUnset);
-
         setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);
 
@@ -138,8 +135,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_taskRowStyle_v2,
                 ABChooser.readChoiceForTest(ABTests.AB_TITLE_ONLY) == 0 ? "0" : "2", ifUnset); //$NON-NLS-1$ //$NON-NLS-2$
 
-        setPreference(prefs, editor, r, R.string.p_use_date_shortcuts,
-                ABChooser.readChoiceForTest(ABTests.AB_USE_DATE_SHORTCUTS) != 0, ifUnset);
+        setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
 
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index fc0b6d15d..1360e500f 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -95,8 +95,6 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_simple_input_boxes, true, ifUnset);
-
         setPreference(prefs, editor, r, R.string.p_show_list_members, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);