am e65a9ab: am 5786f5c: Merge "Fix build." into ics-mr1

* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.

Author: Dianne Hackborn

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java

@@ -160,8 +160,9 @@ public boolean showSoftInput(IInputMethodClient arg0, int arg1, ResultReceiver a
         return false;
     }
 
-    public InputBindResult startInput(IInputMethodClient arg0, IInputContext arg1, EditorInfo arg2,
-            boolean arg3, boolean arg4) throws RemoteException {
+
+    public InputBindResult startInput(IInputMethodClient client, IInputContext inputContext,
+            EditorInfo attribute, int controlFlags) throws RemoteException {
         // TODO Auto-generated method stub
         return null;
     }
@@ -176,10 +177,12 @@ public void updateStatusIcon(IBinder arg0, String arg1, int arg2) throws RemoteE
 
     }
 
-    public void windowGainedFocus(IInputMethodClient arg0, IBinder arg1, boolean arg2,
-            boolean arg3, int arg4, boolean arg5, int arg6) throws RemoteException {
+    @Override
+    public InputBindResult windowGainedFocus(IInputMethodClient client, IBinder windowToken,
+            int controlFlags, int softInputMode, int windowFlags, EditorInfo attribute,
+            IInputContext inputContext) throws RemoteException {
         // TODO Auto-generated method stub
-
+        return null;
     }
 
     public IBinder asBinder() {