From 8e619bdd21577edeafe96ef4bb2cec486d685883 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 18 Mar 2015 12:11:24 -0500
Subject: [PATCH] Fix dialogs

---
 src/main/AndroidManifest.xml                  | 24 +++++++------------
 .../andlib/utility/DialogUtilities.java       | 23 +++++++++++-------
 .../astrid/core/DeleteFilterActivity.java     |  1 -
 src/main/res/values/styles.xml                |  9 ++-----
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index da1e87bd1..8b6d5cfe6 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -294,15 +294,13 @@
 
         <activity
             android:name="com.todoroo.astrid.core.DeleteFilterActivity"
-            android:theme="@style/Tasks.FullTransparent" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name="com.todoroo.astrid.tags.DeleteTagActivity"
-            android:theme="@style/Tasks.FullTransparent" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name="com.todoroo.astrid.tags.RenameTagActivity"
-            android:theme="@style/Tasks.FullTransparent" />
+            android:theme="@style/Tasks.Dialog" />
 
         <!-- alarms -->
         <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
@@ -347,7 +345,7 @@
 
         <activity
             android:name=".activities.ClearGtaskDataActivity"
-            android:theme="@style/ReminderDialog" />
+            android:theme="@style/Tasks.Dialog" />
 
         <!-- repeats -->
 
@@ -394,23 +392,19 @@
 
         <activity
             android:name=".activities.ClearAllDataActivity"
-            android:theme="@style/ReminderDialog" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name=".activities.PurgeDeletedActivity"
-            android:theme="@style/ReminderDialog" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name=".activities.DeleteCompletedActivity"
-            android:theme="@style/ReminderDialog" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name=".activities.DeleteCompletedEventsActivity"
-            android:theme="@style/ReminderDialog" />
-
+            android:theme="@style/Tasks.Dialog" />
         <activity
             android:name=".activities.DeleteAllCalendarEventsActivity"
-            android:theme="@style/ReminderDialog" />
+            android:theme="@style/Tasks.Dialog" />
 
         <!-- backup -->
 
diff --git a/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
index dc23f6912..7b4467fa9 100644
--- a/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
@@ -126,14 +126,21 @@ public class DialogUtilities {
         tryOnUiThread(activity, new Runnable() {
             @Override
             public void run() {
-                new AlertDialog.Builder(activity)
-                .setTitle(R.string.DLG_confirm_title)
-                .setMessage(text)
-                .setTitle(title)
-                .setIcon(icon)
-                .setPositiveButton(okTitleId, okListener)
-                .setNegativeButton(cancelTitleId, cancelListener)
-                .show().setOwnerActivity(activity);
+                AlertDialog dialog = new AlertDialog.Builder(activity)
+                        .setTitle(R.string.DLG_confirm_title)
+                        .setMessage(text)
+                        .setTitle(title)
+                        .setIcon(icon)
+                        .setPositiveButton(okTitleId, okListener)
+                        .setNegativeButton(cancelTitleId, cancelListener)
+                        .show();
+                dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        cancelListener.onClick(dialog, Dialog.BUTTON_NEGATIVE);
+                    }
+                });
+                dialog.setOwnerActivity(activity);
             }
         });
     }
diff --git a/src/main/java/com/todoroo/astrid/core/DeleteFilterActivity.java b/src/main/java/com/todoroo/astrid/core/DeleteFilterActivity.java
index 51240d365..d55e7eda0 100644
--- a/src/main/java/com/todoroo/astrid/core/DeleteFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/DeleteFilterActivity.java
@@ -28,7 +28,6 @@ public class DeleteFilterActivity extends InjectingActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(android.R.style.Theme_Dialog);
         super.onCreate(savedInstanceState);
 
         final long id = getIntent().getLongExtra(CustomFilterExposer.TOKEN_FILTER_ID, -1);
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 1338677ea..361e45c25 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -143,17 +143,12 @@
 
     <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
+    <style name="Tasks.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"/>
+
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
     </style>
 
-    <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
-        <item name="android:windowIsTranslucent">true</item>
-	    <item name="android:windowBackground">@android:color/transparent</item>
-	    <item name="android:backgroundDimEnabled">false</item>
-	    <item name="android:windowIsFloating">true</item>
-	</style>
-
     <!--================================================== General == -->
 
     <style name="TextAppearance" parent="android:TextAppearance">