Projects >> platform_frameworks_base >>3dc756a47a0f31e7cc24b8f0e49935c3f32a73de

Chunk
Conflicting content 
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
<<<<<<< HEAD
import com.android.ide.common.rendering.api.SystemViewCookie;
=======
>>>>>>> 6c600df67388706d24486022fa73ed8786119faf
import com.android.internal.R;
import com.android.internal.app.ActionBarImpl;
import com.android.internal.util.Predicate;
Solution content 
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
import com.android.ide.common.rendering.api.SystemViewCookie;
import com.android.internal.R;
import com.android.internal.app.ActionBarImpl;
import com.android.internal.util.Predicate;
File
ActionBarLayout.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.ArrayList;

<<<<<<< HEAD
import static com.android.ide.common.rendering.api.SystemViewCookie.ACTION_BAR_OVERFLOW;

=======
>>>>>>> 6c600df67388706d24486022fa73ed8786119faf
/**
 * A layout representing the action bar.
 */
Solution content 
import java.util.ArrayList;

import static com.android.ide.common.rendering.api.SystemViewCookie.ACTION_BAR_OVERFLOW;

/**
 * A layout representing the action bar.
 */
File
ActionBarLayout.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        if (mActionBarView != null) {
            // Set action bar to be split, if needed.
<<<<<<< HEAD
            ActionBarContainer splitView = (ActionBarContainer) findViewById(R.id.split_action_bar);
            mActionBarView.setSplitView(splitView);
            mActionBarView.setSplitActionBar(mSplit);

            inflateMenus();

            // Find if the Overflow Menu Button (the three dots) exists. If yes,
            // add the view cookie.
            Predicate overflowMenuButtonTest = new Predicate() {
                @Override
                public boolean apply(View view) {
                    ViewGroup.LayoutParams lp = view.getLayoutParams();
                    return lp instanceof ActionMenuView.LayoutParams &&
                            ((ActionMenuView.LayoutParams) lp).isOverflowButton;
                }
            };
            View overflowMenu = null;
            if (mSplit) {
                if (splitView != null) {
                    overflowMenu = splitView.findViewByPredicate(overflowMenuButtonTest);
                }
            }
            else {
                overflowMenu = mActionBarView.findViewByPredicate(overflowMenuButtonTest);
            }
            if (overflowMenu != null) {
                mBridgeContext.addViewKey(overflowMenu, new SystemViewCookie(ACTION_BAR_OVERFLOW));
            }
=======
            mActionBarView.setSplitView((ActionBarContainer) findViewById(R.id.split_action_bar));
            mActionBarView.setSplitActionBar(mSplit);

            inflateMenus();
>>>>>>> 6c600df67388706d24486022fa73ed8786119faf
        }
    }
Solution content 
            }

        if (mActionBarView != null) {
            // Set action bar to be split, if needed.
            ActionBarContainer splitView = (ActionBarContainer) findViewById(R.id.split_action_bar);
            mActionBarView.setSplitView(splitView);
            mActionBarView.setSplitActionBar(mSplit);

            inflateMenus();

            // Find if the Overflow Menu Button (the three dots) exists. If yes,
            // add the view cookie.
            Predicate overflowMenuButtonTest = new Predicate() {
                @Override
                public boolean apply(View view) {
                    ViewGroup.LayoutParams lp = view.getLayoutParams();
                    return lp instanceof ActionMenuView.LayoutParams &&
                            ((ActionMenuView.LayoutParams) lp).isOverflowButton;
                }
            };
            View overflowMenu = null;
            if (mSplit) {
                if (splitView != null) {
                    overflowMenu = splitView.findViewByPredicate(overflowMenuButtonTest);
                }
            }
            else {
                overflowMenu = mActionBarView.findViewByPredicate(overflowMenuButtonTest);
            if (overflowMenu != null) {
                mBridgeContext.addViewKey(overflowMenu, new SystemViewCookie(ACTION_BAR_OVERFLOW));
            }
        }
    }
File
ActionBarLayout.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
                // if the theme says no title/action bar, then the size will be 0
                if (mActionBarSize > 0) {
<<<<<<< HEAD
                    ActionBarLayout actionBar = createActionBar(context, params);
                    backgroundLayout.addView(actionBar);
                    actionBar.createMenuPopup();
                    mContentRoot = actionBar.getContentRoot();
=======
                    try {
                        actionBar = createActionBar(context, params);
                        backgroundLayout.addView(actionBar);
                        actionBar.createMenuPopup();
                        mContentRoot = actionBar.getContentRoot();
                    } catch (XmlPullParserException e) {

                    }
>>>>>>> 6c600df67388706d24486022fa73ed8786119faf
                } else if (mTitleBarSize > 0) {
                    try {
                        TitleBar titleBar = createTitleBar(context,
Solution content 
                // if the theme says no title/action bar, then the size will be 0
                if (mActionBarSize > 0) {
                    ActionBarLayout actionBar = createActionBar(context, params);
                    backgroundLayout.addView(actionBar);
                    actionBar.createMenuPopup();
                    mContentRoot = actionBar.getContentRoot();
                } else if (mTitleBarSize > 0) {
                    try {
                        TitleBar titleBar = createTitleBar(context,
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Try statement
Variable