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

Commit 1c3913c8 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Removed dynamic attribute assignment and related debug. 

This feature was originally used to support on-the-fly changes to themes
such as colors.  This support has long since been abandoned.
parent 3dbb2cf5

core/java/android/content/res/AssetManager.java

+0 −1
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ public final class AssetManager { 
    private native final int newTheme();

    private native final void deleteTheme(int theme);

    /*package*/ native static final void applyThemeStyle(int theme, int styleRes, boolean force);

    /*package*/ native static final void setAttributeValue(int theme, int attr, int color);

    /*package*/ native static final void copyTheme(int dest, int source);

    /*package*/ native static final int loadThemeAttributeValue(int theme, int ident,

                                                                TypedValue outValue,

core/java/android/content/res/Resources.java

+19 −32
Original line number Diff line number Diff line
@@ -959,11 +959,6 @@ public class Resources { 
            AssetManager.applyThemeStyle(mTheme, resid, force);

        }



        /** @hide */

        public void setAttributeValue(int attr, int color) {

            AssetManager.setAttributeValue(mTheme, attr, color);

        }



        /**

         * Set this theme to hold the same contents as the theme

         * <var>other</var>.  If both of these themes are from the same
@@ -1128,14 +1123,12 @@ public class Resources { 
            array.mRsrcs = attrs;

            array.mXml = parser;



            boolean foo = false;

            if (foo) {

            if (false) {

                int[] data = array.mData;

                

                System.out.println("Attributes:");

                String s = "  Attrs:";

                int i;

                if(set != null){

                for (i=0; i<set.getAttributeCount(); i++) {

                    s = s + " " + set.getAttributeName(i);

                    int id = set.getAttributeNameResource(i);
@@ -1144,11 +1137,7 @@ public class Resources { 
                    }

                    s = s + "=" + set.getAttributeValue(i);

                }

                }

                

                System.out.println(s);

             

                if(true){

                s = "  Found:";

                TypedValue value = new TypedValue();

                for (i=0; i<attrs.length; i++) {
@@ -1162,7 +1151,6 @@ public class Resources { 
                }

                System.out.println(s);

            }

            }



            return array;

        }
@@ -1258,7 +1246,6 @@ public class Resources { 
        array.mRsrcs = attrs;

        array.mXml = parser;



        

        return array;

    }

core/jni/android_util_AssetManager.cpp

+0 −12
Original line number Diff line number Diff line
@@ -831,16 +831,6 @@ static void android_content_AssetManager_applyThemeStyle(JNIEnv* env, jobject cl 
    theme->applyStyle(styleRes, force ? true : false);

}



static void android_content_AssetManager_setAttributeValue(JNIEnv* env, jobject clazz,

                                                           jint themeInt,

                                                           jint attribute,

                                                           jint value)

{

    ResTable::Theme* theme = (ResTable::Theme*)themeInt;

    theme->setAttributeValue(attribute, value);

}





static void android_content_AssetManager_copyTheme(JNIEnv* env, jobject clazz,

                                                   jint destInt, jint srcInt)

{
@@ -1802,8 +1792,6 @@ static JNINativeMethod gAssetManagerMethods[] = { 
        (void*) android_content_AssetManager_getArraySize },

    { "retrieveArray","(I[I)I",

        (void*) android_content_AssetManager_retrieveArray },

    { "setAttributeValue", "(III)V",

	(void*) android_content_AssetManager_setAttributeValue },



    // XML files.

    { "openXmlAssetNative", "(ILjava/lang/String;)I",

include/utils/ResourceTypes.h

+0 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ public: 


        status_t applyStyle(uint32_t resID, bool force=false);

        status_t setTo(const Theme& other);

        void setAttributeValue(uint32_t attribute, uint32_t value);



        /**

         * Retrieve a value in the theme.  If the theme defines this

libs/utils/ResourceTypes.cpp

+0 −23
Original line number Diff line number Diff line
@@ -1307,29 +1307,6 @@ ResTable::Theme::package_info* ResTable::Theme::copy_package(package_info* pi) 
    return newpi;

}



void ResTable::Theme::setAttributeValue(uint32_t attrID, uint32_t value)

{

	const ssize_t p = mTable.getResourcePackageIndex(attrID);

	const uint32_t t = Res_GETTYPE(attrID);

	const uint32_t e = Res_GETENTRY(attrID);



	TABLE_NOISY(LOGV("Looking up attr 0x%08x in theme %p", attrID, this));



	if (p >= 0) {

		const package_info* const pi = mPackages[p];

		if (pi != NULL) {

			if (t < pi->numTypes) {

				const type_info& ti = pi->types[t];

				if (e < ti.numEntries) {

					theme_entry& te = ti.entries[e];

					te.value.data = value;

					te.value.dataType = Res_value::TYPE_FIRST_INT;

				}

			}

		}

	}

}



status_t ResTable::Theme::applyStyle(uint32_t resID, bool force)

{

    const bag_entry* bag;