Force nook to default to phone layout, special version number for pushing to nook market

astrid/AndroidManifest.xml

@@ -6,8 +6,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="4.3.2"
-          android:versionCode="280">
+          android:versionName="4.3.2.1"
+          android:versionCode="281">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->

astrid/src/com/todoroo/astrid/service/MarketStrategy.java

@@ -61,6 +61,15 @@ public abstract class MarketStrategy {
         return false;
     }
 
+    /**
+     * Return true if the preference to use the phone layout should be
+     * turned on by default (only true for Nook)
+     * @return
+     */
+    public boolean defaultPhoneLayout() {
+        return false;
+    }
+
     public static class NoMarketStrategy extends MarketStrategy {
         @Override
         public Intent generateMarketLink(String packageName) {
@@ -142,7 +151,6 @@ public abstract class MarketStrategy {
                 R.string.p_theme_widget,
                 R.string.p_voicePrefSection,
                 R.string.p_end_at_deadline,
-                R.string.p_swipe_lists_enabled,
                 R.string.p_field_missed_calls
             };
         }
@@ -184,12 +192,16 @@ public abstract class MarketStrategy {
                 R.string.p_theme_widget,
                 R.string.p_voicePrefSection,
                 R.string.p_end_at_deadline,
-                R.string.p_swipe_lists_enabled,
                 R.string.p_field_missed_calls,
                 R.string.p_ideas_tab_enabled
             };
         }
 
+        @Override
+        public boolean defaultPhoneLayout() {
+            return true;
+        }
+
         @Override
         public String strategyId() {
             return "nook_market"; //$NON-NLS-1$

astrid/src/com/todoroo/astrid/utility/AstridPreferences.java

@@ -92,6 +92,10 @@ public class AstridPreferences {
             Preferences.setString(R.string.p_theme, ThemeService.THEME_WHITE);
         }
 
+        if (Constants.MARKET_STRATEGY.defaultPhoneLayout()) {
+            Preferences.setIfUnset(prefs, editor, r, R.string.p_force_phone_layout, true);
+        }
+
         setShowFriendsView();
 
         setShowFeaturedLists();