Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diego Perez
2016-05-25 16:23:55 +00:00
committed by Android (Google) Code Review
parent cfbca5640c 790e5f6c1c
commit 36cd747bb6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java
View File

@@ -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);