From 2c5d9ae29c01299c304e72fa669a9f51a8da2501 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 24 Oct 2012 16:36:37 -0700
Subject: [PATCH] Upgrade message, final AB test probabilities, minor copy
 update

---
 astrid/res/values/strings-core.xml                    |  2 +-
 .../com/todoroo/astrid/service/UpgradeService.java    | 11 +++++++++++
 .../com/todoroo/astrid/service/abtesting/ABTests.java |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index b9a12091b..3638592a0 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -580,7 +580,7 @@
   <string name="CRA_invitation_prompt">Want to invite them?</string>
   
   <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Monitor calendar events</string>
+  <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
 
   <!-- Calendar reminder: pref description disabled -->
   <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about upcoming calendar events</string>
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index f3b1ffc6f..9f5979d57 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -224,6 +224,17 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
+        if (from < V4_4) {
+            newVersionString(changeLog, "4.4 (10/25/12)", new String[] {
+                "Astrid calendar assistant will help you prepare for meetings! Enable or " +
+                    "disable in Settings -> Premium and misc. settings -> Calendar assistant",
+                "Full Chinese translation",
+                "Widgets will now reflect manual ordering",
+                "Accept pending friend requests from the people view",
+                "Several minor bug and crash fixes"
+            });
+        }
+
         if (from >= V4_3_0 && from < V4_3_4) {
             newVersionString(changeLog, "4.3.4 (10/2/12)", new String[] {
                 "Magic words in task title now correctly removed when placed in parentheses",
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 9b2a3c559..9ee9d6512 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -133,7 +133,7 @@ public class ABTests {
         addTest(AB_SIMPLE_TASK_ROW, new int[] { 1, 1 },
                 new int[] { 1, 0 }, new String[] { "original-row-style", "simple-row-style" }); //$NON-NLS-1$ //$NON-NLS-2$
 
-        addTest(AB_CALENDAR_REMINDERS, new int[] { 0, 1 },
-                new int[] { 0, 1 }, new String[] { "no-cal-reminders", "show-cal-reminders" }); //$NON-NLS-1$ //$NON-NLS-2$
+        addTest(AB_CALENDAR_REMINDERS, new int[] { 3, 1 },
+                new int[] { 3, 1 }, new String[] { "no-cal-reminders", "show-cal-reminders" }); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }