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

am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev

Browse Source 
* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
This commit is contained in:
Deepanshu Gupta
2014-06-11 17:43:32 +00:00
committed by Android Git Automerger
parent 3e950680c4 096e639d3d
commit 6370c7f554
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/android/view/BridgeInflater.java
View File

@@ -151,7 +151,7 @@ public final class BridgeInflater extends LayoutInflater {
@Override
public View inflate(int resource, ViewGroup root) {
Context context = getContext();
if (context instanceof ContextThemeWrapper) {
while (context instanceof ContextThemeWrapper) {
context = ((ContextThemeWrapper) context).getBaseContext();
}
if (context instanceof BridgeContext) {
@@ -217,7 +217,7 @@ public final class BridgeInflater extends LayoutInflater {
private void setupViewInContext(View view, AttributeSet attrs) {
Context context = getContext();
if (context instanceof ContextThemeWrapper) {
while (context instanceof ContextThemeWrapper) {
context = ((ContextThemeWrapper) context).getBaseContext();
}
if (context instanceof BridgeContext) {

2
tools/layoutlib/bridge/src/android/view/MenuInflater_Delegate.java
View File

@@ -48,7 +48,7 @@ public class MenuInflater_Delegate {
AttributeSet attrs) {
if (menuItem instanceof BridgeMenuItemImpl) {
Context context = thisInflater.getContext();
if (context instanceof ContextThemeWrapper) {
while (context instanceof ContextThemeWrapper) {
context = ((ContextThemeWrapper) context).getBaseContext();
}
if (context instanceof BridgeContext) {

2
tools/layoutlib/bridge/src/com/android/internal/view/menu/BridgeMenuItemImpl.java
View File

@@ -42,7 +42,7 @@ public class BridgeMenuItemImpl extends MenuItemImpl {
CharSequence title, int showAsAction) {
super(menu, group, id, categoryOrder, ordering, title, showAsAction);
Context context = menu.getContext();
if (context instanceof ContextThemeWrapper) {
while (context instanceof ContextThemeWrapper) {
context = ((ContextThemeWrapper) context).getBaseContext();
}
if (context instanceof BridgeContext) {