Some polish to the custom filter view, remove from menu for new users

astrid/res/layout/custom_filter_activity.xml

@@ -26,16 +26,6 @@
         android:layout_weight="100"
         android:scrollbars="vertical"
         android:cacheColorHint="#00000000"/>
-
-    <!-- help text -->
-    <TextView android:id="@+id/help"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="left"
-        android:paddingLeft="5dip"
-        android:text="@string/CFA_help"
-        style="@style/TextAppearance"/>
     
     <!-- buttons -->
     <LinearLayout

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

@@ -27,8 +27,11 @@ import com.todoroo.astrid.actfm.sync.AstridNewSyncMigrator;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.core.PluginServices;
+import com.todoroo.astrid.core.SavedFilter;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.helper.DueDateTimeMigrator;
@@ -225,6 +228,16 @@ public final class UpgradeService {
                                 new SubtasksMetadataMigration().performMigration();
 
                             if (from < V4_6_0) {
+                                if (Preferences.getBoolean(R.string.p_use_filters, false)) {
+                                    TodorooCursor<StoreObject> cursor = PluginServices.getStoreObjectDao().query(Query.select(StoreObject.PROPERTIES).where(
+                                            StoreObject.TYPE.eq(SavedFilter.TYPE)).limit(1));
+                                    try {
+                                        if (cursor.getCount() == 0)
+                                            Preferences.setBoolean(R.string.p_use_filters, false);
+                                    } finally {
+                                        cursor.close();
+                                    }
+                                }
                                 new AstridNewSyncMigrator().performMigration();
                                 new GCMIntentService.GCMMigration().performMigration(UpgradeActivity.this);
                             }

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

@@ -112,7 +112,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_calendar_reminders, true, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_use_filters, true, ifUnset);
+        setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);