Merge branch 'save_task_on_back_button' of https://github.com/MPK44/tasks into MPK44-save_task_on_back_button

src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java

@@ -132,6 +132,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp
             dialogBuilder.newMessageDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> finish())
+                    .setNeutralButton(R.string.save, (dialog, which) -> save())
                     .show();
         }
     }

src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -272,6 +272,7 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar
             dialogBuilder.newMessageDialog(R.string.discard_confirmation)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> discard())
+                    .setNeutralButton(R.string.save, (dialog, which) -> save())
                     .show();
         } else {
             discard();

src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -356,6 +356,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
             dialogBuilder.newMessageDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> finish())
+                    .setNeutralButton(R.string.save, (dialog, which) -> saveAndView())
                     .show();
         }
     }