auto import from //depot/cupcake/@137055

samples/SoftKeyboard/src/com/example/android/softkeyboard/SoftKeyboard.java

@@ -65,11 +65,11 @@ public class SoftKeyboard extends InputMethodService
     private long mLastShiftTime;
     private long mMetaState;
     
-    private Keyboard mSymbolsKeyboard;
-    private Keyboard mSymbolsShiftedKeyboard;
-    private Keyboard mQwertyKeyboard;
+    private LatinKeyboard mSymbolsKeyboard;
+    private LatinKeyboard mSymbolsShiftedKeyboard;
+    private LatinKeyboard mQwertyKeyboard;
     
-    private Keyboard mCurKeyboard;
+    private LatinKeyboard mCurKeyboard;
     
     private String mWordSeparators;
     
@@ -208,6 +208,10 @@ public class SoftKeyboard extends InputMethodService
                 // keyboard with no special features.
                 mCurKeyboard = mQwertyKeyboard;
         }
+        
+        // Update the label on the enter key, depending on what the application
+        // says it will do.
+        mCurKeyboard.setImeOptions(getResources(), attribute.imeOptions);
     }
 
     /**
@@ -504,6 +508,18 @@ public class SoftKeyboard extends InputMethodService
         }
     }
 
+    public void onText(CharSequence text) {
+        InputConnection ic = getCurrentInputConnection();
+        if (ic == null) return;
+        ic.beginBatchEdit();
+        if (mComposing.length() > 0) {
+            commitTyped(ic);
+        }
+        ic.commitText(text, 0);
+        ic.endBatchEdit();
+        updateShiftKeyState(getCurrentInputEditorInfo());
+    }
+
     /**
      * Update the list of available candidates from the current composing
      * text.  This will need to be filled in by however you are determining