Merge pull request #115 from StingerAJ/120109_sb_merge_tabletbranch

120109 sb merge tabletbranch

astrid/AndroidManifest.xml

@@ -64,11 +64,11 @@
 
   <uses-sdk android:targetSdkVersion="10"
             android:minSdkVersion="7" />
-  <supports-screens />
+  <supports-screens android:xlargeScreens="true" android:largeScreens="true"/>
   
   <application android:icon="@drawable/icon" android:label="@string/app_name"
                android:theme="@style/Theme"
-               android:name="greendroid.app.GDApplication">
+               android:name="greendroid.app.GDApplication" android:hardwareAccelerated="true" android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
                
     <!-- ====================================================== Activities = -->
         

astrid/res/layout-small-land/filter_list_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.FilterListActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/filterlist_fragment">
-</fragment>

astrid/res/layout-small-land/task_edit_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskEditActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/taskedit_fragment">
-</fragment>

astrid/res/layout-small-land/task_list_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskListActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/tasklist_fragment">
-</fragment>

astrid/res/layout-small/filter_list_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.FilterListActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/filterlist_fragment">
-</fragment>

astrid/res/layout-small/task_edit_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskEditActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/taskedit_fragment">
-</fragment>

astrid/res/layout-small/task_list_wrapper_activity.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskListActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/tasklist_fragment">
-</fragment>

astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java

@@ -17,14 +17,23 @@ public class FilterListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
         setContentView(R.layout.filter_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.tasklist_fragment);
-        if (frag != null)
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {

astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java

@@ -16,14 +16,23 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
-                .findFragmentById(R.id.taskedit_fragment);
-        if (frag != null)
-        {
+                .findFragmentById(R.id.tasklist_fragment);
+        if (frag != null) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java

@@ -16,14 +16,23 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.filterlist_fragment);
-        if (frag != null && frag.isInLayout())
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {