Merge "Remove icon and negative button from dialogs"
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ddc69f1..fc795b4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2163,8 +2163,6 @@
             }
         };
         final AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setIcon(R.drawable.ic_dialog_keyboard)
-                .setNegativeButton(android.R.string.cancel, null)
                 .setItems(items, listener)
                 .setTitle(title);
         showOptionDialogInternal(builder.create());
@@ -2191,8 +2189,6 @@
             }
         };
         final AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setIcon(R.drawable.ic_dialog_keyboard)
-                .setNegativeButton(android.R.string.cancel, null)
                 .setItems(items, listener)
                 .setTitle(title);
         showOptionDialogInternal(builder.create());