Projects >> platform_frameworks_base >>b50cea0267763d271df14a55859c6f203eeff041

Chunk
Conflicting content 
    }

    public ViewGroup(Context context, AttributeSet attrs) {
<<<<<<< HEAD
        this(context, attrs, 0);
    }

    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr) {
        this(context, attrs, defStyleAttr, 0);
=======
        super(context, attrs);
        initViewGroup();
        initFromAttributes(context, attrs, 0);
>>>>>>> 1569d61f66431118666e51d55817193718d83206
    }

    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
Solution content 
    }

    public ViewGroup(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
    }

    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr) {
        this(context, attrs, defStyleAttr, 0);
    }

    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
File
ViewGroup.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
        super(context, attrs, defStyleAttr, defStyleRes);
        initViewGroup();
<<<<<<< HEAD
        initFromAttributes(context, attrs, defStyleAttr, defStyleRes);
=======
        initFromAttributes(context, attrs, defStyle);
>>>>>>> 1569d61f66431118666e51d55817193718d83206
    }

    private boolean debugDraw() {
Solution content 
    public ViewGroup(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
        super(context, attrs, defStyleAttr, defStyleRes);
        initViewGroup();
        initFromAttributes(context, attrs, defStyleAttr, defStyleRes);
    }

    private boolean debugDraw() {
File
ViewGroup.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        mPersistentDrawingCache = PERSISTENT_SCROLLING_CACHE;
    }

<<<<<<< HEAD
    private void initFromAttributes(
            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup);
=======
    private void initFromAttributes(Context context, AttributeSet attrs, int defStyle) {
        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup, defStyle, 0);
>>>>>>> 1569d61f66431118666e51d55817193718d83206

        final int N = a.getIndexCount();
        for (int i = 0; i < N; i++) {
Solution content 
        mPersistentDrawingCache = PERSISTENT_SCROLLING_CACHE;
    }

    private void initFromAttributes(
            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup, defStyleAttr,
                defStyleRes);

        final int N = a.getIndexCount();
        for (int i = 0; i < N; i++) {
File
ViewGroup.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Variable