Projects >> frameworks_base_disabled >>d7542263c6dfa2522e8844c7c714fbf2ad112385

Chunk
Conflicting content 
     */
    private BridgeTypedArray createStyleBasedTypedArray(StyleResourceValue style, int[] attrs)
            throws Resources.NotFoundException {
<<<<<<< HEAD

        BridgeTypedArray ta = ((BridgeResources) mSystemResources).newTypeArray(attrs.length,
                false, true, null);
=======
        AtomicBoolean frameworkAttributes = new AtomicBoolean();
        AtomicReference attrName = new AtomicReference();
        TreeMap styleNameMap = searchAttrs(attrs, frameworkAttributes, attrName);

        BridgeTypedArray ta = ((BridgeResources) mSystemResources).newTypeArray(attrs.length,
                style.isFramework(), frameworkAttributes.get(), attrName.get());
>>>>>>> 155cf6c1e191bb03fe24db8663715862d8e6a43d

        // for each attribute, get its name so that we can search it in the style
        for (int i = 0 ; i < attrs.length ; i++) {
Solution content 
     */
    private BridgeTypedArray createStyleBasedTypedArray(StyleResourceValue style, int[] attrs)
            throws Resources.NotFoundException {

        BridgeTypedArray ta = ((BridgeResources) mSystemResources).newTypeArray(attrs.length,
                false, true, null);

        // for each attribute, get its name so that we can search it in the style
        for (int i = 0 ; i < attrs.length ; i++) {
File
BridgeContext.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        Map map = null;
        if (mPlatformStyleable) {
            map = Bridge.getEnumValues(mNames[index]);
<<<<<<< HEAD
        } else if (mStyleableName != null) {
=======
        } else {
>>>>>>> 155cf6c1e191bb03fe24db8663715862d8e6a43d
            // get the styleable matching the resolved name
            RenderResources res = mContext.getRenderResources();
            ResourceValue styleable = res.getProjectResource(ResourceType.DECLARE_STYLEABLE,
Solution content 
        Map map = null;
        if (mPlatformStyleable) {
            map = Bridge.getEnumValues(mNames[index]);
        } else if (mStyleableName != null) {
            // get the styleable matching the resolved name
            RenderResources res = mContext.getRenderResources();
            ResourceValue styleable = res.getProjectResource(ResourceType.DECLARE_STYLEABLE,
File
BridgeTypedArray.java
Developer's decision
Version 1
Kind of conflict
If statement