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

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

Merge "resolved conflicts for merge of 34706a4c to master"

parents b7956de3 cb581bbe

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

+6 −5
Original line number Diff line number Diff line
@@ -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