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

Commit a40b4c4e authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Workaround to display menus for AppCompat themes" into nyc-dev am: 36cd747b 

am: 6cc74264

* commit '6cc74264':
  Workaround to display menus for AppCompat themes

Change-Id: I92ba5b7cf04414b173a20385861792924a7ce50f
parents 2753194c 6cc74264

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

+4 −1
Original line number 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.layoutlib.bridge.Bridge;

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.BridgeActionBar;

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


    private BridgeActionBar createActionBar(@NonNull BridgeContext context,

            @NonNull SessionParams params) {

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



        BridgeActionBar actionBar;

        if (mBuilder.isThemeAppCompat()) {

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

            actionBar = new AppCompatActionBar(context, params);

        } else {

            actionBar = new FrameworkActionBar(context, params);