diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index feb0ae011..62417c7cb 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -275,7 +275,7 @@
-
+
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
index 90b359f63..6fee04e2d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -38,8 +38,8 @@ import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Field;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.sql.UnaryCriterion;
-import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.activity.TaskListWrapperActivity;
+import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.CustomFilterCriterion;
import com.todoroo.astrid.api.Filter;
@@ -50,6 +50,7 @@ import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
import com.todoroo.astrid.service.StatisticsService;
+import com.todoroo.astrid.service.ThemeService;
/**
* Activity that allows users to build custom filters
@@ -125,6 +126,8 @@ public class CustomFilterActivity extends ListActivity {
}
private TextView filterName;
+ private boolean isDialog;
+
private CustomFilterAdapter adapter;
private final Map criteria = Collections.synchronizedMap(new LinkedHashMap());
@@ -137,6 +140,7 @@ public class CustomFilterActivity extends ListActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
+ setupForDialogOrFullscreen();
super.onCreate(savedInstanceState);
ContextManager.setContext(this);
@@ -157,6 +161,14 @@ public class CustomFilterActivity extends ListActivity {
setUpListeners();
}
+ private void setupForDialogOrFullscreen() {
+ isDialog = AndroidUtilities.isTabletSized(this);
+ if (isDialog)
+ setTheme(ThemeService.getDialogTheme());
+ else
+ ThemeService.applyTheme(this);
+ }
+
/**
* Populate criteria list with built in and plugin criteria. The request is sent to every application
* registered to listen for this broadcast. Each plugin can then add criteria to this activity.
@@ -413,9 +425,8 @@ public class CustomFilterActivity extends ListActivity {
// view
Filter filter = new Filter(title, title, sql.toString(), values);
- Intent taskListActivity = new Intent(this, TaskListWrapperActivity.class);
- taskListActivity.putExtra(TaskListActivity.TOKEN_FILTER, filter);
- startActivity(taskListActivity);
+ setResult(RESULT_OK, new Intent().putExtra(TagSettingsActivity.TOKEN_NEW_FILTER, filter));
+ finish();
}
/**
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
index 520f08620..e2853a570 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
@@ -19,7 +19,7 @@ public class FilterView extends View {
private int start = 0, end = 0, max = 1;
private static final int FILTER_COLOR = Color.rgb(85, 155, 255);
- private static final int BG_COLOR = Color.WHITE;
+ private static final int BG_COLOR = Color.CYAN;
private static final int TEXT_COLOR = Color.BLACK;
// --- boilerplate
diff --git a/astrid/res/layout/custom_filter_activity.xml b/astrid/res/layout/custom_filter_activity.xml
index a2422c207..2f696c65f 100644
--- a/astrid/res/layout/custom_filter_activity.xml
+++ b/astrid/res/layout/custom_filter_activity.xml
@@ -3,13 +3,14 @@
+ android:orientation="vertical"
+ style="@style/Content">
@@ -28,8 +29,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
- android:text="@string/CFA_help"/>
-
+ android:text="@string/CFA_help"
+ style="@style/TextAppearance"/>
+
+ android:gravity="center_vertical"
+ style="@style/TextAppearance"/>