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

Merge "Support framework menus in ActionBar" into lmp-dev

Browse Source 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
This commit is contained in:
Deepanshu Gupta
2014-11-04 00:50:48 +00:00
committed by android-build-merger
parent cd5f3bab37 c23487aa18
commit 33996b9878
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomActionBarWrapper.java
View File

@@ -32,7 +32,6 @@ import com.android.internal.widget.ActionBarView;
import com.android.internal.widget.DecorToolbar; import com.android.internal.widget.DecorToolbar;
import com.android.layoutlib.bridge.android.BridgeContext; import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper; import com.android.layoutlib.bridge.impl.ResourceHelper;
import com.android.resources.ResourceType;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.ActionBar.Tab; import android.app.ActionBar.Tab;
@@ -49,6 +48,9 @@ import android.widget.ActionMenuPresenter;
import android.widget.Toolbar; import android.widget.Toolbar;
import android.widget.Toolbar_Accessor; 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}. * A common API to access {@link ToolbarActionBar} and {@link WindowDecorActionBar}.
*/ */
@@ -128,15 +130,26 @@ public abstract class CustomActionBarWrapper {
MenuInflater inflater = new MenuInflater(getActionMenuContext()); MenuInflater inflater = new MenuInflater(getActionMenuContext());
MenuBuilder menuBuilder = getMenuBuilder(); MenuBuilder menuBuilder = getMenuBuilder();
for (String name : mCallback.getMenuIdNames()) { for (String name : mCallback.getMenuIdNames()) {
if (mContext.getRenderResources().getProjectResource(ResourceType.MENU, name) int id = -1;
!= null) { if (name.startsWith(ANDROID_NS_NAME_PREFIX)) {
int id = mContext.getProjectResourceValue(ResourceType.MENU, name, -1); // 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) { if (id > -1) {
inflater.inflate(id, menuBuilder); inflater.inflate(id, menuBuilder);
} }
} }
} }
}
/** /**
* The context used for the ActionBar and the menus in the ActionBarView. * The context used for the ActionBar and the menus in the ActionBarView.