Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
This commit is contained in:
Dianne Hackborn
2012-02-24 16:24:40 -08:00
committed by Android Git Automerger
parent dc5fa1859d 5786f5cf1b
commit e65a9ab1ea
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java
View File

@@ -160,8 +160,9 @@ public class BridgeIInputMethodManager implements IInputMethodManager {
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 class BridgeIInputMethodManager implements IInputMethodManager {
}
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() {