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

Commit 053b553f authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix layoutlib breakage due to I681b711f6f40a94c25b7acd3a44eb3539486afab"

parents 00dde0bd 9657804a

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

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ public final class BridgeWindow implements IWindow { 
    }



    @Override

    public void resized(Rect arg1, Rect arg1p5, Rect arg2, Rect arg3,

            boolean arg4, Configuration arg5) throws RemoteException {

    public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, boolean b,

            Configuration configuration) throws RemoteException {

        // pass for now.

    }

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

+4 −3
Original line number Diff line number Diff line
@@ -85,10 +85,11 @@ public final class BridgeWindowSession implements IWindowSession { 
        // pass for now.

        return false;

    }



    @Override

    public int relayout(IWindow arg0, int seq, LayoutParams arg1, int arg2, int arg3, int arg4,

            int arg4_5, Rect arg5Z, Rect arg5, Rect arg6, Rect arg7, Configuration arg7b,

            Surface arg8) throws RemoteException {

    public int relayout(IWindow iWindow, int i, LayoutParams layoutParams, int i2,

            int i3, int i4, int i5, Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5,

            Configuration configuration, Surface surface) throws RemoteException {

        // pass for now.

        return 0;

    }