From 085e10bb2a997bcf82149e7da3f0123f8a0b54dc Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 14 Aug 2012 14:13:25 -0700
Subject: [PATCH] Version bump and upgrade message

---
 astrid/AndroidManifest.xml                                | 4 ++--
 astrid/src/com/todoroo/astrid/service/UpgradeService.java | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 9a1cca851..449664d82 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -6,8 +6,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="4.2.5"
-          android:versionCode="276">
+          android:versionName="4.2.6"
+          android:versionCode="277">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 0f4471ce7..b6b0b35c9 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -46,6 +46,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V4_2_6 = 277;
     public static final int V4_2_5 = 276;
     public static final int V4_2_4 = 275;
     public static final int V4_2_3 = 274;
@@ -215,6 +216,13 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
+        if (from >= V4_2_0 && from < V4_2_6) {
+            newVersionString(changeLog, "4.2.6 (8/14/12)", new String[] {
+               "Tablet users can opt to use the single-pane phone layout (Settings -> Astrid Labs)",
+               "Minor polish and bug fixes"
+            });
+        }
+
         if (from >= V4_2_0 && from < V4_2_5) {
             newVersionString(changeLog, "4.2.5 (8/13/12)", new String[] {
                "Improved tablet UX",