Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6370c7f5 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

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

* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
parents 3e950680 096e639d

tools/layoutlib/bridge/src/android/view/BridgeInflater.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {

tools/layoutlib/bridge/src/android/view/MenuInflater_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {