Merge "Support framework menus in ActionBar" into lmp-dev
automerge: c23487a
* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
Support framework menus in ActionBar
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomActionBarWrapper.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomActionBarWrapper.java
index f3fc397..f283e34 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomActionBarWrapper.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomActionBarWrapper.java
@@ -32,7 +32,6 @@
import com.android.internal.widget.DecorToolbar;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
-import com.android.resources.ResourceType;
import android.app.ActionBar;
import android.app.ActionBar.Tab;
@@ -49,6 +48,9 @@
import android.widget.Toolbar;
import android.widget.Toolbar_Accessor;
+import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX;
+import static com.android.resources.ResourceType.MENU;
+
/**
* A common API to access {@link ToolbarActionBar} and {@link WindowDecorActionBar}.
*/
@@ -128,12 +130,23 @@
MenuInflater inflater = new MenuInflater(getActionMenuContext());
MenuBuilder menuBuilder = getMenuBuilder();
for (String name : mCallback.getMenuIdNames()) {
- if (mContext.getRenderResources().getProjectResource(ResourceType.MENU, name)
- != null) {
- int id = mContext.getProjectResourceValue(ResourceType.MENU, name, -1);
- if (id > -1) {
- inflater.inflate(id, menuBuilder);
+ int id = -1;
+ if (name.startsWith(ANDROID_NS_NAME_PREFIX)) {
+ // Framework menu.
+ name = name.substring(ANDROID_NS_NAME_PREFIX.length());
+ if (mContext.getRenderResources().getFrameworkResource(MENU, name) != null) {
+ // We need to check for the existence of the menu first, since getting the id
+ // never returns the default value. It creates a new value if one is not found.
+ id = mContext.getFrameworkResourceValue(MENU, name, -1);
}
+ } else {
+ // Project menu.
+ if (mContext.getRenderResources().getProjectResource(MENU, name) != null) {
+ id = mContext.getProjectResourceValue(MENU, name, -1);
+ }
+ }
+ if (id > -1) {
+ inflater.inflate(id, menuBuilder);
}
}
}