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

Commit ed750bb9 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Removed legacy code used in our initial design for themes.

parent 8d620e4c

core/java/android/content/res/TypedArray.java

+4 −31
Original line number Diff line number Diff line 
package android.content.res;



import com.android.internal.util.XmlUtils;



import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

import com.android.internal.util.XmlUtils;



import java.util.Arrays;
@@ -677,11 +676,6 @@ public class TypedArray { 
            cookie, data[index+AssetManager.STYLE_DATA]);

    }



    /* Hack to allow TypedArrayComposite to instantiate a simple wrapper. */

    TypedArray() {

        mResources = null;

    }



    /*package*/ TypedArray(Resources resources, int[] data, int[] indices, int len) {

        mResources = resources;

        mData = data;
@@ -692,25 +686,4 @@ public class TypedArray { 
    public String toString() {

        return Arrays.toString(mData);

    }

    

    /**

     * @hide

     */

    void dump() {

        int attrCount = getIndexCount();

        int[] data = mData;

        String s = "  Found:";

        TypedValue value = new TypedValue();

        for (int i=0; i<attrCount; i++) {

            int attr = getIndex(i);

            int d = i*AssetManager.STYLE_NUM_ENTRIES;

            value.type = data[d+AssetManager.STYLE_TYPE];

            value.data = data[d+AssetManager.STYLE_DATA];

            value.assetCookie = data[d+AssetManager.STYLE_ASSET_COOKIE];

            value.resourceId = data[d+AssetManager.STYLE_RESOURCE_ID];

            s = s + " 0x" + Integer.toHexString(attr)

                + "=" + value;

        }

        System.out.println(s);

    }

}
 
 No newline at end of file

core/java/android/content/res/XmlBlock.java

+0 −4
Original line number Diff line number Diff line
@@ -196,10 +196,6 @@ final class XmlBlock { 
        public int getAttributeCount() {

            return mEventType == START_TAG ? nativeGetAttributeCount(mParseState) : -1;

        }

        /** @hide */

        public int getAttributeDataType(int index) {

            return nativeGetAttributeDataType(mParseState, index);

        }

        public String getAttributeValue(int index) {

            int id = nativeGetAttributeStringValue(mParseState, index);

            if (DEBUG) System.out.println("getAttributeValue of " + index + " = " + id);

core/java/android/util/AttributeSet.java

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ package android.util; 
 */

public interface AttributeSet {

    public int getAttributeCount();

    /** @hide */

    public int getAttributeDataType(int index);

    public String getAttributeName(int index);

    public String getAttributeValue(int index);

    public String getAttributeValue(String namespace, String name);

core/java/android/util/XmlPullAttributes.java

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ class XmlPullAttributes implements AttributeSet { 
        return mParser.getAttributeCount();

    }



    /** @hide */

    public int getAttributeDataType(int index) {

        throw new UnsupportedOperationException();

    }



    public String getAttributeName(int index) {

        return mParser.getAttributeName(index);

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -193,11 +193,6 @@ public class BridgeXmlBlockParser implements XmlResourceParser { 
        return mParser.getAttributeNamespace(index);

    }



	/** @hide */

	public int getAttributeDataType(int index) {

		throw new RuntimeException("getAttributeDataType not supported");

	}



    public String getAttributeName(int index) {

        return mParser.getAttributeName(index);

    }