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

Commit eb26f5ce authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

LayoutLib: Fix typedArray caching. 

The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
parent 199c74ea

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

+27 −19
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import com.android.util.Pair; 
import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.annotation.Nullable;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -136,8 +136,9 @@ public final class BridgeContext extends Context { 
    private Map<StyleResourceValue, Integer> mStyleToDynamicIdMap;

    private int mDynamicIdGenerator = 0x02030000; // Base id for R.style in custom namespace



    // cache for TypedArray generated from IStyleResourceValue object

    private Map<int[], Map<Integer, BridgeTypedArray>> mTypedArrayCache;

    // cache for TypedArray generated from StyleResourceValue object

    private Map<int[], Map<List<StyleResourceValue>, Map<Integer, BridgeTypedArray>>>

            mTypedArrayCache;

    private BridgeInflater mBridgeInflater;



    private BridgeContentResolver mContentResolver;
@@ -588,31 +589,38 @@ public final class BridgeContext extends Context { 
            }

        }



        // The map is from

        // attrs (int[]) -> context's current themes (List<StyleRV>) -> resid (int) -> typed array.

        if (mTypedArrayCache == null) {

            mTypedArrayCache = new HashMap<int[], Map<Integer,BridgeTypedArray>>();



            Map<Integer, BridgeTypedArray> map = new HashMap<Integer, BridgeTypedArray>();

            mTypedArrayCache.put(attrs, map);



            BridgeTypedArray ta = createStyleBasedTypedArray(style, attrs);

            map.put(resid, ta);



            return ta;

            mTypedArrayCache = new IdentityHashMap<int[],

                    Map<List<StyleResourceValue>, Map<Integer, BridgeTypedArray>>>();

        }



        // get the 2nd map

        Map<Integer, BridgeTypedArray> map = mTypedArrayCache.get(attrs);

        if (map == null) {

            map = new HashMap<Integer, BridgeTypedArray>();

            mTypedArrayCache.put(attrs, map);

        Map<List<StyleResourceValue>, Map<Integer, BridgeTypedArray>> map2 =

                mTypedArrayCache.get(attrs);

        if (map2 == null) {

            map2 = new HashMap<List<StyleResourceValue>, Map<Integer, BridgeTypedArray>>();

            mTypedArrayCache.put(attrs, map2);

        }



        // get the 3rd map

        List<StyleResourceValue> currentThemes = mRenderResources.getAllThemes();

        Map<Integer, BridgeTypedArray> map3 = map2.get(currentThemes);

        if (map3 == null) {

            map3 = new HashMap<Integer, BridgeTypedArray>();

            // Create a copy of the list before adding it to the map. This allows reusing the

            // existing list.

            currentThemes = new ArrayList<StyleResourceValue>(currentThemes);

            map2.put(currentThemes, map3);

        }



        // get the array from the 2nd map

        BridgeTypedArray ta = map.get(resid);

        // get the array from the 3rd map

        BridgeTypedArray ta = map3.get(resid);



        if (ta == null) {

            ta = createStyleBasedTypedArray(style, attrs);

            map.put(resid, ta);

            map3.put(resid, ta);

        }



        return ta;