Merge "Fix build breakage." into nyc-dev

This commit is contained in:
Yohei Yukawa
2016-02-22 23:22:44 +00:00
committed by Android (Google) Code Review

View File

@@ -183,15 +183,6 @@ public class BridgeIInputMethodManager implements IInputMethodManager {
return false;
}
@Override
public InputBindResult startInput(
/* @InputMethodClient.StartInputReason */ int startInputReason,
IInputMethodClient client, IInputContext inputContext, EditorInfo attribute,
int controlFlags) throws RemoteException {
// TODO Auto-generated method stub
return null;
}
@Override
public boolean switchToLastInputMethod(IBinder arg0) throws RemoteException {
// TODO Auto-generated method stub
@@ -228,7 +219,7 @@ public class BridgeIInputMethodManager implements IInputMethodManager {
}
@Override
public InputBindResult windowGainedFocus(
public InputBindResult startInputOrWindowGainedFocus(
/* @InputMethodClient.StartInputReason */ int startInputReason,
IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode,
int windowFlags, EditorInfo attribute, IInputContext inputContext)