Merge remote-tracking branch 'upstream/master' into 130122_sb_new_sync

12 years ago · ed6d4fc852
parent cca5ecfe0f 78869c93d9
commit ed6d4fc852
1 changed files with 9 additions and 0 deletions
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@ -539,6 +539,15 @@ public class TagSettingsActivity extends FragmentActivity {
        return super.onCreateOptionsMenu(menu);
    }

+    @Override
+    public void onBackPressed() {
+        if (tagName.getText().length() == 0) {
+            finish();
+        } else {
+            saveSettings();
+        }
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        switch(item.getItemId()) {