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

Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d

Browse Source 
am: 5e2de2eb12

* commit '5e2de2eb1221c9dafd260b42c732417cfc2b074f':
  Workaround to display menus for AppCompat themes

Change-Id: I5042125c7797c7534c0c83d2e7370d7c5f70be94
This commit is contained in:
Diego Perez
2016-05-25 17:32:33 +00:00
committed by android-build-merger
parent 9eab5b40b5 5e2de2eb12
commit 64b185e49d
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.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);