Projects >> platform_frameworks_base >>519e77bbf26e0a6ea10f6e94c5b86c4c2d57c633

Chunk
Conflicting content 
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO,
                Capability.FIXED_SCALABLE_NINE_PATCH,
<<<<<<< HEAD
                Capability.RTL,
                Capability.ACTION_BAR);
=======
                Capability.RTL);
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb


        BridgeAssetManager.initSystem();
Solution content 
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO,
                Capability.FIXED_SCALABLE_NINE_PATCH,
                Capability.RTL,
                Capability.ACTION_BAR);


        BridgeAssetManager.initSystem();
File
Bridge.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
=======
            HardwareConfig hardwareConfig = params.getHardwareConfig();
            BridgeContext context = getContext();
            boolean isRtl = Bridge.isLocaleRtl(params.getLocale());
<<<<<<< HEAD
            int layoutDirection = isRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
            ActionBarLayout actionBar = null;
            int direction = isRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb

            // the view group that receives the window background.
            ViewGroup backgroundView = null;
Solution content 
            HardwareConfig hardwareConfig = params.getHardwareConfig();
            BridgeContext context = getContext();
            boolean isRtl = Bridge.isLocaleRtl(params.getLocale());
            int layoutDirection = isRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
            ActionBarLayout actionBar = null;

            // the view group that receives the window background.
            ViewGroup backgroundView = null;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
            if (mWindowIsFloating || params.isForceNoDecor()) {
                backgroundView = mViewRoot = mContentRoot = new FrameLayout(context);
<<<<<<< HEAD
                mViewRoot.setLayoutDirection(layoutDirection);
=======
                mViewRoot.setLayoutDirection(direction);
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
            } else {
                if (hasSoftwareButtons() && mNavigationBarOrientation == LinearLayout.VERTICAL) {
                    /*
Solution content 
            if (mWindowIsFloating || params.isForceNoDecor()) {
                backgroundView = mViewRoot = mContentRoot = new FrameLayout(context);
                mViewRoot.setLayoutDirection(layoutDirection);
            } else {
                if (hasSoftwareButtons() && mNavigationBarOrientation == LinearLayout.VERTICAL) {
                    /*
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                       the bottom
                     */
                    LinearLayout topLayout = new LinearLayout(context);
<<<<<<< HEAD
                    topLayout.setLayoutDirection(layoutDirection);
=======
                    topLayout.setLayoutDirection(direction);
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
                    mViewRoot = topLayout;
                    topLayout.setOrientation(LinearLayout.HORIZONTAL);
Solution content 
                       the bottom
                     */
                    LinearLayout topLayout = new LinearLayout(context);
                    topLayout.setLayoutDirection(layoutDirection);
                    mViewRoot = topLayout;
                    topLayout.setOrientation(LinearLayout.HORIZONTAL);
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    topLayout.setOrientation(LinearLayout.HORIZONTAL);

                    try {
<<<<<<< HEAD
                        NavigationBar navigationBar = createNavigationBar(context,
                                hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
=======
                        NavigationBar navigationBar = new NavigationBar(context,
                                hardwareConfig.getDensity(), LinearLayout.VERTICAL, isRtl,
                                params.isRtlSupported());
                        navigationBar.setLayoutParams(
                                new LinearLayout.LayoutParams(
                                        mNavigationBarSize,
                                        LayoutParams.MATCH_PARENT));
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
                        topLayout.addView(navigationBar);
                    } catch (XmlPullParserException e) {
Solution content 
                    topLayout.setOrientation(LinearLayout.HORIZONTAL);

                    try {
                        NavigationBar navigationBar = createNavigationBar(context,
                                hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
                        topLayout.addView(navigationBar);
                    } catch (XmlPullParserException e) {
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                LinearLayout topLayout = new LinearLayout(context);
                topLayout.setOrientation(LinearLayout.VERTICAL);
<<<<<<< HEAD
                topLayout.setLayoutDirection(layoutDirection);
=======
                topLayout.setLayoutDirection(direction);
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
                // if we don't already have a view root this is it
                if (mViewRoot == null) {
                    mViewRoot = topLayout;
Solution content 
                LinearLayout topLayout = new LinearLayout(context);
                topLayout.setOrientation(LinearLayout.VERTICAL);
                topLayout.setLayoutDirection(layoutDirection);
                // if we don't already have a view root this is it
                if (mViewRoot == null) {
                    mViewRoot = topLayout;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                if (mStatusBarSize > 0) {
                    // system bar
                    try {
<<<<<<< HEAD
                        StatusBar statusBar = createStatusBar(context, hardwareConfig.getDensity(),
                                layoutDirection, params.isRtlSupported());
                        topLayout.addView(statusBar);
=======
                        StatusBar systemBar = new StatusBar(context, hardwareConfig.getDensity(),
                                direction, params.isRtlSupported());
                        systemBar.setLayoutParams(
                                new LinearLayout.LayoutParams(
                                        LayoutParams.MATCH_PARENT, mStatusBarSize));
                        topLayout.addView(systemBar);
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
                    } catch (XmlPullParserException e) {

                    }
Solution content 
                if (mStatusBarSize > 0) {
                    // system bar
                    try {
                        StatusBar statusBar = createStatusBar(context, hardwareConfig.getDensity(),
                                layoutDirection, params.isRtlSupported());
                        topLayout.addView(statusBar);
                    } catch (XmlPullParserException e) {

                    }
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                        mNavigationBarSize > 0) {
                    // system bar
                    try {
<<<<<<< HEAD
                        NavigationBar navigationBar = createNavigationBar(context,
                                hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
=======
                        NavigationBar navigationBar = new NavigationBar(context,
                                hardwareConfig.getDensity(), LinearLayout.HORIZONTAL, isRtl,
                                params.isRtlSupported());
                        navigationBar.setLayoutParams(
                                new LinearLayout.LayoutParams(
                                        LayoutParams.MATCH_PARENT, mNavigationBarSize));
>>>>>>> 44cc867f7d4ca212b7003057148b8cdabb8f85fb
                        topLayout.addView(navigationBar);
                    } catch (XmlPullParserException e) {
Solution content 
                        mNavigationBarSize > 0) {
                    // system bar
                    try {
                        NavigationBar navigationBar = createNavigationBar(context,
                                hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
                        topLayout.addView(navigationBar);
                    } catch (XmlPullParserException e) {
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable