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

Commit ab3f5779 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 

* commit 'ee1b4976':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
parents fbef58fa ee1b4976

tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ public final class Canvas_Delegate { 
    /*package*/ static void native_drawCircle(int nativeCanvas,

            float cx, float cy, float radius, int paint) {

        native_drawOval(nativeCanvas,

                new RectF(cx - radius, cy - radius, radius*2, radius*2),

                new RectF(cx - radius, cy - radius, radius, radius),

                paint);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge { 
                Capability.UNBOUND_RENDERING,

                Capability.CUSTOM_BACKGROUND_COLOR,

                Capability.RENDER,

                //Capability.LAYOUT_ONLY, // disable to run on ADT 10.0 which doesn't include this.

                Capability.LAYOUT_ONLY,

                Capability.EMBEDDED_LAYOUT,

                Capability.VIEW_MANIPULATION,

                Capability.ADAPTER_BINDING,

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

+1 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ import java.io.File; 
import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileOutputStream;

import java.io.FileReader;

import java.io.IOException;

import java.io.InputStream;

import java.util.HashMap;
@@ -337,7 +336,7 @@ public final class BridgeContext extends Activity { 
                try {

                    KXmlParser parser = new KXmlParser();

                    parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

                    parser.setInput(new FileReader(xml));

                    parser.setInput(new FileInputStream(xml), "UTF-8"); //$NON-NLS-1$);



                    // set the resource ref to have correct view cookies

                    mBridgeInflater.setResourceReference(resource);

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

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import android.view.View; 
import android.view.ViewGroup;



import java.io.File;

import java.io.FileReader;

import java.io.FileInputStream;



/**

 * Custom implementation of {@link LayoutInflater} to handle custom views.
@@ -177,7 +177,7 @@ public final class BridgeInflater extends LayoutInflater { 
                    try {

                        KXmlParser parser = new KXmlParser();

                        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

                        parser.setInput(new FileReader(f));

                        parser.setInput(new FileInputStream(f), "UTF-8"); //$NON-NLS-1$



                        BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(

                                parser, bridgeContext, false);

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

+4 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.view.ViewGroup.LayoutParams; 
import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileReader;

import java.io.InputStream;



/**
@@ -244,7 +243,7 @@ public final class BridgeResources extends Resources { 
                        // give that to our XmlBlockParser

                        parser = new KXmlParser();

                        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

                        parser.setInput(new FileReader(xml));

                        parser.setInput(new FileInputStream(xml), "UTF-8"); //$NON-NLS-1$);

                    }

                }
@@ -282,7 +281,7 @@ public final class BridgeResources extends Resources { 
                    // give that to our XmlBlockParser

                    parser = new KXmlParser();

                    parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

                    parser.setInput(new FileReader(xml));

                    parser.setInput(new FileInputStream(xml), "UTF-8"); //$NON-NLS-1$);



                    return new BridgeXmlBlockParser(parser, mContext, mPlatformResourceFlag[0]);

                }
@@ -501,7 +500,7 @@ public final class BridgeResources extends Resources { 
                    try {

                        KXmlParser parser = new KXmlParser();

                        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

                        parser.setInput(new FileReader(f));

                        parser.setInput(new FileInputStream(f), "UTF-8"); //$NON-NLS-1$);



                        return new BridgeXmlBlockParser(parser, mContext, mPlatformResourceFlag[0]);

                    } catch (XmlPullParserException e) {
@@ -536,7 +535,7 @@ public final class BridgeResources extends Resources { 
        try {

            KXmlParser parser = new KXmlParser();

            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

            parser.setInput(new FileReader(f));

            parser.setInput(new FileInputStream(f), "UTF-8"); //$NON-NLS-1$);



            return new BridgeXmlBlockParser(parser, mContext, mPlatformResourceFlag[0]);

        } catch (XmlPullParserException e) {