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

Merge "Fix build breakage." into nyc-dev

Browse Source 
am: 4449a27fe9

* commit '4449a27fe9f518be2c181307c14f28278026ab84':
  Fix build breakage.
This commit is contained in:
Yohei Yukawa
2016-02-22 23:33:10 +00:00
committed by android-build-merger
parent a04f1b4e4e 4449a27fe9
commit 0079d93dba
1 changed files with 1 additions and 10 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

@@ -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)