Projects >> platform_frameworks_base >>cf319ba55d0782925a598c94b5e9c6604af5869a

Chunk
Conflicting content 
import com.android.internal.R;
import com.android.internal.app.ActionBarImpl;
import com.android.internal.util.Predicate;
<<<<<<< HEAD
import com.android.internal.view.menu.ActionMenuView;
=======
>>>>>>> 6b9e07a41248155e7d7c3f2e4e9ccb09ce7116ae
import com.android.internal.view.menu.MenuBuilder;
import com.android.internal.view.menu.MenuBuilderAccessor;
import com.android.internal.view.menu.MenuItemImpl;
Solution content 
import com.android.internal.R;
import com.android.internal.app.ActionBarImpl;
import com.android.internal.util.Predicate;
import com.android.internal.view.menu.ActionMenuView;
import com.android.internal.view.menu.MenuBuilder;
import com.android.internal.view.menu.MenuBuilderAccessor;
import com.android.internal.view.menu.MenuItemImpl;
File
ActionBarLayout.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            Predicate overflowMenuButtonTest = new Predicate() {
                @Override
                public boolean apply(View view) {
<<<<<<< HEAD
                    ViewGroup.LayoutParams lp = view.getLayoutParams();
                    return lp instanceof ActionMenuView.LayoutParams &&
                            ((ActionMenuView.LayoutParams) lp).isOverflowButton;
=======
                    return view.getClass().getName()
                            .equals("android.widget.ActionMenuPresenter$OverflowMenuButton");
>>>>>>> 6b9e07a41248155e7d7c3f2e4e9ccb09ce7116ae
                }
            };
            View overflowMenu = null;
Solution content 
            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;
File
ActionBarLayout.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Method invocation
Return statement
Variable