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

Commit 8f17523d authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

Merge dba35f1b from honeycomb-mr1. do not merge. 

Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe
LayoutLib: Properly configure KXmlParser to read UTF8
parent 0aa1017f

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) {

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

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import android.view.LayoutInflater_Delegate; 
import android.view.ViewGroup.LayoutParams;



import java.io.File;

import java.io.FileReader;

import java.io.FileInputStream;

import java.util.Arrays;

import java.util.Map;
@@ -316,7 +316,7 @@ public final class BridgeTypedArray extends TypedArray { 
            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 blockParser = new BridgeXmlBlockParser(

                        parser, mContext, resValue.isFramework());

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ abstract class CustomBar extends LinearLayout { 
        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

        parser.setInput(

                getClass().getResourceAsStream(layoutPath),

                "UTF8");

                "UTF8"); //$NON-NLS-1$



        BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(

                parser, (BridgeContext) context, false /*platformFile*/);