Projects >> android-frameworks-base-with-remote-control-service >>162dd490cd0b502c717db59300b3fd902f76710a

Chunk
Conflicting content 
                //Capability.LAYOUT_ONLY, // disable to run on ADT 10.0 which doesn't include this.
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
<<<<<<< HEAD
                Capability.PLAY_ANIMATION,
                Capability.ANIMATED_VIEW_MANIPULATION,
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO);
=======
                Capability.ADAPTER_BINDING);
>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153


        BridgeAssetManager.initSystem();
Solution content 
                //Capability.LAYOUT_ONLY, // disable to run on ADT 10.0 which doesn't include this.
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
                Capability.PLAY_ANIMATION,
                Capability.ANIMATED_VIEW_MANIPULATION,
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO);


        BridgeAssetManager.initSystem();
File
Bridge.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
     * Returns the lock for the bridge
     */
        throw new IllegalArgumentException("viewObject is not a View");
    }

<<<<<<< HEAD
=======
    @Override
    public int getViewBaseline(Object viewObject) {
        if (viewObject instanceof View) {
            return ((View) viewObject).getBaseline();
        }

        throw new IllegalArgumentException("viewObject is not a View");
    }

>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153
    /**
Solution content 
        throw new IllegalArgumentException("viewObject is not a View");
    }

    /**
     * Returns the lock for the bridge
     */
File
Bridge.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import android.view.View.AttachInfo;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
<<<<<<< HEAD
import android.view.ViewGroup.MarginLayoutParams;
=======
>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153
import android.widget.AbsListView;
import android.widget.AbsSpinner;
import android.widget.AdapterView;
Solution content 
import android.view.View.AttachInfo;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.AbsListView;
import android.widget.AbsSpinner;
import android.widget.AdapterView;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ListView;
<<<<<<< HEAD
import android.widget.QuickContactBadge;
=======
>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153
import android.widget.TabHost;
import android.widget.TabWidget;
import android.widget.TabHost.TabSpec;
Solution content 
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.QuickContactBadge;
import android.widget.TabHost;
import android.widget.TabWidget;
import android.widget.TabHost.TabSpec;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            // done with the parser, pop it.
            context.popParser();

<<<<<<< HEAD
            Fragment_Delegate.setProjectCallback(null);

=======
>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153
            // set the AttachInfo on the root view.
            AttachInfo info = new AttachInfo(new BridgeWindowSession(), new BridgeWindow(),
                    new Handler(), null);
Solution content 
            // done with the parser, pop it.
            context.popParser();

            Fragment_Delegate.setProjectCallback(null);

            // set the AttachInfo on the root view.
            AttachInfo info = new AttachInfo(new BridgeWindowSession(), new BridgeWindow(),
                    new Handler(), null);
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            // get the view ID.
            int id = view.getId();
            throws PostInflateException {
        if (view instanceof TabHost) {
            setupTabHost((TabHost)view, projectCallback);
<<<<<<< HEAD
        } else if (view instanceof QuickContactBadge) {
            QuickContactBadge badge = (QuickContactBadge) view;
            badge.setImageToDefault();
=======
>>>>>>> 9d9a7466cd051748ba656acd39265099294c4153
        } else if (view instanceof AdapterView) {
Solution content 
            throws PostInflateException {
        if (view instanceof TabHost) {
            setupTabHost((TabHost)view, projectCallback);
        } else if (view instanceof QuickContactBadge) {
            QuickContactBadge badge = (QuickContactBadge) view;
            badge.setImageToDefault();
        } else if (view instanceof AdapterView) {
            // get the view ID.
            int id = view.getId();
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Variable