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

Commit 87ab45c0 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android (Google) Code Review
Browse files

Merge "LayoutLib: extract resource resolution into its own class." into honeycomb

parents bdac9e0f d1d6fafc

tools/layoutlib/bridge/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 


LOCAL_JAVA_LIBRARIES := \

	kxml2-2.3.0 \

	layoutlib_api-prebuilt \

	ninepatch-prebuilt

	layoutlib_api-prebuilt



LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib

LOCAL_STATIC_JAVA_LIBRARIES := \

	temp_layoutlib \

	ninepatch-prebuilt



LOCAL_MODULE := layoutlib

tools/layoutlib/bridge/src/com/android/ide/common/resources/ResourceResolver.java

0 → 100644
+560 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java

+0 −19
Original line number Diff line number Diff line
@@ -41,25 +41,6 @@ public class BridgeConstants { 


    public final static String R = "com.android.internal.R";



    public final static String PREFIX_ANDROID_RESOURCE_REF = "@android:";

    public final static String PREFIX_RESOURCE_REF = "@";

    public final static String PREFIX_ANDROID_THEME_REF = "?android:";

    public final static String PREFIX_THEME_REF = "?";



    public final static String PREFIX_ANDROID = "android:";



    public final static String RES_ANIMATOR = "animator";

    public final static String RES_STYLE = "style";

    public final static String RES_ATTR = "attr";

    public final static String RES_DIMEN = "dimen";

    public final static String RES_DRAWABLE = "drawable";

    public final static String RES_COLOR = "color";

    public final static String RES_LAYOUT = "layout";

    public final static String RES_STRING = "string";

    public final static String RES_ID = "id";



    public final static String REFERENCE_STYLE = RES_STYLE + "/";

    public final static String REFERENCE_NULL = "@null";



    public final static String MATCH_PARENT = "match_parent";

    public final static String FILL_PARENT = "fill_parent";

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+31 −323

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −5
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.layoutlib.bridge.android; 
import com.android.ide.common.rendering.api.IProjectCallback;

import com.android.ide.common.rendering.api.LayoutLog;

import com.android.ide.common.rendering.api.ResourceValue;

import com.android.ide.common.resources.ResourceResolver;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.BridgeConstants;



import org.kxml2.io.KXmlParser;

import org.xmlpull.v1.XmlPullParser;
@@ -155,14 +155,14 @@ public final class BridgeInflater extends LayoutInflater { 


            String[] layoutInfo = Bridge.resolveResourceValue(resource);

            if (layoutInfo != null) {

                value = bridgeContext.getFrameworkResource(BridgeConstants.RES_LAYOUT,

                        layoutInfo[0]);

                value = bridgeContext.getResolver().getFrameworkResource(

                        ResourceResolver.RES_LAYOUT, layoutInfo[0]);

            } else {

                layoutInfo = mProjectCallback.resolveResourceValue(resource);



                if (layoutInfo != null) {

                    value = bridgeContext.getProjectResource(BridgeConstants.RES_LAYOUT,

                            layoutInfo[0]);

                    value = bridgeContext.getResolver().getProjectResource(

                            ResourceResolver.RES_LAYOUT, layoutInfo[0]);

                }

            }