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

Commit 36cd747b authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Workaround to display menus for AppCompat themes" into nyc-dev

parents cfbca564 790e5f6c

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.ide.common.rendering.api.SessionParams; 
import com.android.ide.common.rendering.api.StyleResourceValue;

import com.android.ide.common.rendering.api.StyleResourceValue;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.Bridge;

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

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

import com.android.layoutlib.bridge.android.RenderParamsFlags;

import com.android.layoutlib.bridge.bars.AppCompatActionBar;

import com.android.layoutlib.bridge.bars.AppCompatActionBar;

import com.android.layoutlib.bridge.bars.BridgeActionBar;

import com.android.layoutlib.bridge.bars.BridgeActionBar;

import com.android.layoutlib.bridge.bars.Config;

import com.android.layoutlib.bridge.bars.Config;
@@ -232,8 +233,10 @@ class Layout extends RelativeLayout { 




    private BridgeActionBar createActionBar(@NonNull BridgeContext context,

    private BridgeActionBar createActionBar(@NonNull BridgeContext context,

            @NonNull SessionParams params) {

            @NonNull SessionParams params) {

        boolean isMenu = "menu".equals(params.getFlag(RenderParamsFlags.FLAG_KEY_ROOT_TAG));



        BridgeActionBar actionBar;

        BridgeActionBar actionBar;

        if (mBuilder.isThemeAppCompat()) {

        if (mBuilder.isThemeAppCompat() && !isMenu) {

            actionBar = new AppCompatActionBar(context, params);

            actionBar = new AppCompatActionBar(context, params);

        } else {

        } else {

            actionBar = new FrameworkActionBar(context, params);

            actionBar = new FrameworkActionBar(context, params);