Bug 5074527: IME no longer pops up. Text suggestions disabled.

Change-Id: I89e77b091a44a59c43cf4c84ff58655feced130d

3 files changed, 7 insertions, 13 deletions

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 29b7432..53c614b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -52,6 +52,7 @@
        <item name="android:paddingLeft">8dp</item>
        <item name="android:paddingRight">8dp</item>
        <item name="android:paddingBottom">0dp</item>
+       <item name="android:suggestionsEnabled">false</item>
     </style>
 
     <style name="btn_row_style">
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 441cfed..23567e9 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -23,6 +23,7 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 
 public class Calculator extends Activity implements PanelSwitcher.Listener, Logic.Listener {
     EventListener mListener = new EventListener();
@@ -50,6 +51,10 @@ public class Calculator extends Activity implements PanelSwitcher.Listener, Logi
     public void onCreate(Bundle state) {
         super.onCreate(state);
 
+        // Disable IME for this application
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
+                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+
         setContentView(R.layout.main);
 
         mPersist = new Persist(this);
diff --git a/src/com/android/calculator2/CalculatorEditText.java b/src/com/android/calculator2/CalculatorEditText.java
index a61ad95..586c994 100644
--- a/src/com/android/calculator2/CalculatorEditText.java
+++ b/src/com/android/calculator2/CalculatorEditText.java
@@ -19,7 +19,6 @@ package com.android.calculator2;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.graphics.Rect;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -27,7 +26,6 @@ import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -36,17 +34,7 @@ public class CalculatorEditText extends EditText {
     public CalculatorEditText(Context context, AttributeSet attrs) {
         super(context, attrs);
         setCustomSelectionActionModeCallback(new NoTextSelectionMode());
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-
-        InputMethodManager imm = ((InputMethodManager) getContext().
-                getSystemService(Context.INPUT_METHOD_SERVICE));
-        if (imm != null && imm.isActive(this)) {
-            imm.hideSoftInputFromWindow(getApplicationWindowToken(), 0);
-        }
+        setSuggestionsEnabled(false);
     }
 
     @Override