commit cbaf6d85f185ef34649825412dcc080b587fcf08
author Tadashi G. Takaoka <takaoka@google.com> Mon Apr 23 22:18:27 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Apr 25 15:42:14 2012 +0900
tree 4f0658f21e2152e1a641550b0edb2b16679116c6
parent 9f0a137f82a1f6f191d1ff3beb9104efec16b30d

Cancel SubtypePreference dialog properly

Bug: 6384416
Bug: 6387408
Change-Id: Ia7b0653a09410b42a55915815c887bf0ad56c856

java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java

diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
index 579cc39..8ce91fd 100644
--- a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
+++ b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
@@ -141,7 +141,8 @@
         public KeyboardLayoutSetAdapter getKeyboardLayoutSetAdapter();
     }
 
-    static class SubtypePreference extends DialogPreference {
+    static class SubtypePreference extends DialogPreference
+            implements DialogInterface.OnCancelListener {
         private static final String KEY_PREFIX = "subtype_pref_";
         private static final String KEY_NEW_SUBTYPE = KEY_PREFIX + "new";
 
@@ -205,6 +206,7 @@
         @Override
         protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
             final Context context = builder.getContext();
+            builder.setCancelable(true).setOnCancelListener(this);
             if (isIncomplete()) {
                 builder.setPositiveButton(R.string.add, this)
                         .setNegativeButton(android.R.string.cancel, this);
@@ -233,6 +235,13 @@
         }
 
         @Override
+        public void onCancel(DialogInterface dialog) {
+            if (isIncomplete()) {
+                mProxy.onRemovePressed(this);
+            }
+        }
+
+        @Override
         public void onClick(DialogInterface dialog, int which) {
             super.onClick(dialog, which);
             switch (which) {