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

Commit 8deae79d authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Bug fix in layoutlib"

parents 3f382330 7d3ae4f1

tools/layoutlib/bridge/src/android/view/MenuInflater_Delegate.java

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.internal.view.menu.BridgeMenuItemImpl; 
import com.android.internal.view.menu.MenuView;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.android.BridgeContext;

import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;

import com.android.tools.layoutlib.annotations.LayoutlibDelegate;



import android.util.AttributeSet;
@@ -45,7 +44,7 @@ import android.util.AttributeSet; 
public class MenuInflater_Delegate {



    @LayoutlibDelegate

    /*package*/ static void emptyMethod(MenuInflater thisInflater, MenuItem menuItem,

    /*package*/ static void registerMenu(MenuInflater thisInflater, MenuItem menuItem,

            AttributeSet attrs) {

        if (menuItem instanceof BridgeMenuItemImpl) {

            Context context = thisInflater.getContext();
@@ -67,9 +66,9 @@ public class MenuInflater_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void emptyMethod(MenuInflater thisInflater, SubMenu subMenu,

    /*package*/ static void registerMenu(MenuInflater thisInflater, SubMenu subMenu,

            AttributeSet parser) {

        emptyMethod(thisInflater, subMenu.getItem(), parser);

        registerMenu(thisInflater, subMenu.getItem(), parser);

    }



}

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public final class CreateInfo implements ICreateInfo { 
        "android.view.ViewRootImpl#isInTouchMode",

        "android.view.WindowManagerGlobal#getWindowManagerService",

        "android.view.inputmethod.InputMethodManager#getInstance",

        "android.view.MenuInflater#emptyMethod",

        "android.view.MenuInflater#registerMenu",

        "com.android.internal.view.menu.MenuBuilder#createNewMenuItem",

        "com.android.internal.util.XmlUtils#convertValueToInt",

        "com.android.internal.textservice.ITextServicesManager$Stub#asInterface",