Projects >> android_frameworks_base >>572c6037c44f3a77dc2ff101101809d67bc1a7fd

Chunk
Conflicting content
    
    public ActionMenuView(Context context, AttributeSet attrs) {
        super(context, attrs);
<<<<<<< HEAD
=======
        
        final Resources res = getResources();

        // Measure for initial configuration
        mMaxItems = getMaxActionButtons();

        // TODO There has to be a better way to indicate that we don't have a hard menu key.
        final Configuration config = res.getConfiguration();
        mReserveOverflow = config.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
        mWidthLimit = res.getDisplayMetrics().widthPixels / 2;
        
        TypedArray a = context.obtainStyledAttributes(com.android.internal.R.styleable.Theme);
        mDivider = a.getDrawable(com.android.internal.R.styleable.Theme_dividerVertical);
        a.recycle();
        
        mDividerPadding = DIVIDER_PADDING * res.getDisplayMetrics().density;

>>>>>>> 143c529f28bd49e077e4bc36ff30ed2ff7ffb838
        setBaselineAligned(false);
    }
Solution content
    
    public ActionMenuView(Context context, AttributeSet attrs) {
        super(context, attrs);
        setBaselineAligned(false);
    }
File
ActionMenuView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Variable