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

resolved conflicts for merge of 34706a4c to master

Browse Source 
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
This commit is contained in:
Dianne Hackborn
2012-02-24 16:37:35 -08:00
parent 2521a01970 34706a4c81
commit cb581bbe2e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,8 +184,8 @@ public class BridgeIInputMethodManager implements IInputMethodManager {
}
@Override
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;
}
@@ -209,10 +209,11 @@ public class BridgeIInputMethodManager implements IInputMethodManager {
}
@Override
public void windowGainedFocus(IInputMethodClient arg0, IBinder arg1, boolean arg2,
boolean arg3, int arg4, boolean arg5, int arg6) throws RemoteException {
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;
}
@Override