Keep ImportantNoticeDialog showing after orientation changed

Bug: 13951402
Change-Id: Ia6340d48843abca68ebadd299827cbe43516cc39

1 files changed, 6 insertions, 9 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 059f36288..84558ca24 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -657,9 +657,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             mInputLogic.commitTyped(mSettings.getCurrent(), LastComposedWord.NOT_A_SEPARATOR);
             mInputLogic.mConnection.finishComposingText();
             mInputLogic.mConnection.endBatchEdit();
-            if (isShowingOptionDialog()) {
-                mOptionsDialog.dismiss();
-            }
         }
         PersonalizationDictionarySessionRegistrar.onConfigurationChanged(this, conf,
                 mInputLogic.mSuggest.mDictionaryFacilitator);
@@ -990,7 +987,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         }
 
         if (TRACE) Debug.stopMethodTracing();
-        if (mOptionsDialog != null && mOptionsDialog.isShowing()) {
+        if (isShowingOptionDialog()) {
             mOptionsDialog.dismiss();
             mOptionsDialog = null;
         }
@@ -1186,7 +1183,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     // Implement {@link ImportantNoticeDialog.ImportantNoticeDialogListener}
     @Override
-    public void onDismissImportantNoticeDialog(final int nextVersion) {
+    public void onUserAcknowledgmentOfImportantNoticeDialog(final int nextVersion) {
         setNeutralSuggestionStrip();
     }
 
@@ -1694,7 +1691,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         final AlertDialog.Builder builder = new AlertDialog.Builder(
                 DialogUtils.getPlatformDialogThemeContext(this));
         builder.setItems(items, listener).setTitle(title);
-        showOptionDialog(builder.create());
+        final AlertDialog dialog = builder.create();
+        dialog.setCancelable(true /* cancelable */);
+        dialog.setCanceledOnTouchOutside(true /* cancelable */);
+        showOptionDialog(dialog);
     }
 
     // TODO: Move this method out of {@link LatinIME}.
@@ -1704,9 +1704,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             return;
         }
 
-        dialog.setCancelable(true /* cancelable */);
-        dialog.setCanceledOnTouchOutside(true /* cancelable */);
-
         final Window window = dialog.getWindow();
         final WindowManager.LayoutParams lp = window.getAttributes();
         lp.token = windowToken;