Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5786f5cf authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix build." into ics-mr1

parents 133dc2d7 b69b2c01

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

+8 −5
Original line number Diff line number Diff line
@@ -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() {