From 9f5b5c9f61d0af325f8987b06d54d1814d390b86 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 11 Jan 2015 20:31:20 -0600 Subject: [PATCH] Fix new custom filter on tablets --- src/main/AndroidManifest.xml | 4 ++-- .../com/todoroo/astrid/core/CustomFilterActivity.java | 10 +--------- .../org/tasks/preferences/ActivityPreferences.java | 4 ---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 487fd1926..fc9186776 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -5,8 +5,8 @@ --> + android:versionName="4.7.7" + android:versionCode="348"> diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 4175e497d..bf9bac335 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -153,7 +153,7 @@ public class CustomFilterActivity extends InjectingActionBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setupForDialogOrFullscreen(); + preferences.applyTheme(); ActionBar ab = getSupportActionBar(); if (ab != null) { @@ -178,14 +178,6 @@ public class CustomFilterActivity extends InjectingActionBarActivity { setUpListeners(); } - private void setupForDialogOrFullscreen() { - if (preferences.useTabletLayout()) { - preferences.applyDialogTheme(); - } else { - preferences.applyTheme(); - } - } - /** * 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. diff --git a/src/main/java/org/tasks/preferences/ActivityPreferences.java b/src/main/java/org/tasks/preferences/ActivityPreferences.java index 6bb955b55..9eec1b1a3 100644 --- a/src/main/java/org/tasks/preferences/ActivityPreferences.java +++ b/src/main/java/org/tasks/preferences/ActivityPreferences.java @@ -50,10 +50,6 @@ public class ActivityPreferences extends Preferences { } } - public void applyDialogTheme() { - applyTheme(R.style.TasksDialog); - } - public void applyTranslucentDialogTheme() { applyTheme(R.style.ReminderDialog); }