Projects >> android-frameworks-base-with-screenshot-tweaks >>5e42147af3a8f284f9caa329c9fbfc994ca1d0da

Chunk
Conflicting content 
        // setup the display Metrics.
        DisplayMetrics metrics = new DisplayMetrics();
<<<<<<< HEAD
        metrics.densityDpi = metrics.noncompatDensityDpi =
                hardwareConfig.getDensity().getDpiValue();
=======
        metrics.densityDpi = hardwareConfig.getDensity().getDpiValue();
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1

        metrics.density = metrics.noncompatDensity =
                metrics.densityDpi / (float) DisplayMetrics.DENSITY_DEFAULT;
Solution content 
        // setup the display Metrics.
        DisplayMetrics metrics = new DisplayMetrics();
        metrics.densityDpi = metrics.noncompatDensityDpi =
                hardwareConfig.getDensity().getDpiValue();

        metrics.density = metrics.noncompatDensity =
                metrics.densityDpi / (float) DisplayMetrics.DENSITY_DEFAULT;
File
RenderAction.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import com.android.layoutlib.bridge.bars.FakeActionBar;
import com.android.layoutlib.bridge.bars.NavigationBar;
import com.android.layoutlib.bridge.bars.StatusBar;
<<<<<<< HEAD
=======
import com.android.layoutlib.bridge.bars.TabletSystemBar;
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1
import com.android.layoutlib.bridge.bars.TitleBar;
import com.android.layoutlib.bridge.impl.binding.FakeAdapter;
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
Solution content 
import com.android.layoutlib.bridge.bars.FakeActionBar;
import com.android.layoutlib.bridge.bars.NavigationBar;
import com.android.layoutlib.bridge.bars.StatusBar;
import com.android.layoutlib.bridge.bars.TitleBar;
import com.android.layoutlib.bridge.impl.binding.FakeAdapter;
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
import com.android.resources.ResourceType;
import com.android.resources.ScreenOrientation;
<<<<<<< HEAD
=======
import com.android.resources.ScreenSize;
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1
import com.android.util.Pair;

import org.xmlpull.v1.XmlPullParserException;
Solution content 
import org.xmlpull.v1.XmlPullParserException;
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
import com.android.resources.ResourceType;
import com.android.resources.ScreenOrientation;
import com.android.util.Pair;
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        findStatusBar(resources, metrics);
        findActionBar(resources, metrics);
        findNavigationBar(resources, metrics);
<<<<<<< HEAD

        // FIXME: find those out, and possibly add them to the render params
        boolean hasSystemNavBar = true;
        boolean hasNavigationBar = true;
        IWindowManager iwm = new IWindowManagerImpl(getContext().getConfiguration(),
                metrics, Surface.ROTATION_0,
                hasSystemNavBar, hasNavigationBar);
        WindowManagerGlobal_Delegate.setWindowManagerService(iwm);
=======
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1

        // build the inflater and parser.
        mInflater = new BridgeInflater(context, params.getProjectCallback());
Solution content 
        findStatusBar(resources, metrics);
        findActionBar(resources, metrics);
        findNavigationBar(resources, metrics);

        boolean hasSystemNavBar = true;
        boolean hasNavigationBar = true;
        // FIXME: find those out, and possibly add them to the render params
        IWindowManager iwm = new IWindowManagerImpl(getContext().getConfiguration(),
                metrics, Surface.ROTATION_0,
                hasSystemNavBar, hasNavigationBar);
        WindowManagerGlobal_Delegate.setWindowManagerService(iwm);

        // build the inflater and parser.
        mInflater = new BridgeInflater(context, params.getProjectCallback());
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                 * we're creating the following layout
                 *
                   +-------------------------------------------------+
<<<<<<< HEAD
                   | Status bar (always)                             |
=======
                   | Status bar (except for xlarge tablets)          |
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1
                   +-------------------------------------------------+
                   | (Layout with background drawable)               |
                   | +---------------------------------------------+ |
Solution content 
                 * we're creating the following layout
                 *
                   +-------------------------------------------------+
                   | Status bar (always)                             |
                   +-------------------------------------------------+
                   | (Layout with background drawable)               |
                   | +---------------------------------------------+ |
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
                        mNavigationBarSize > 0) {
                    // system bar
                    try {
<<<<<<< HEAD
                        NavigationBar navigationBar = new NavigationBar(context,
                                hardwareConfig.getDensity(), LinearLayout.HORIZONTAL);
=======
                        CustomBar navigationBar;
                        if (hardwareConfig.getScreenSize() == ScreenSize.XLARGE) {
                            navigationBar = new TabletSystemBar(context,
                                    hardwareConfig.getDensity());
                        } else {
                            navigationBar = new NavigationBar(context,
                                    hardwareConfig.getDensity(), LinearLayout.HORIZONTAL);
                        }

>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1
                        navigationBar.setLayoutParams(
                                new LinearLayout.LayoutParams(
                                        LayoutParams.MATCH_PARENT, mNavigationBarSize));
Solution content 
                        mNavigationBarSize > 0) {
                    // system bar
                    try {
                        NavigationBar navigationBar = new NavigationBar(context,
                                hardwareConfig.getDensity(), LinearLayout.HORIZONTAL);
                        navigationBar.setLayoutParams(
                                new LinearLayout.LayoutParams(
                                        LayoutParams.MATCH_PARENT, mNavigationBarSize));
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    }

    private void findStatusBar(RenderResources resources, DisplayMetrics metrics) {
<<<<<<< HEAD
        boolean windowFullscreen = getBooleanThemeValue(resources,
                "windowFullscreen", false /*defaultValue*/);
=======
        // status bar is on for all but x-large device
        HardwareConfig hardwareConfig = getParams().getHardwareConfig();
        if (hardwareConfig.getScreenSize() != ScreenSize.XLARGE) {
            boolean windowFullscreen = getBooleanThemeValue(resources,
                    "windowFullscreen", false /*defaultValue*/);
>>>>>>> 64b3de296cdbc8c02e2890f8853409c6d49cddb1

        if (windowFullscreen == false && mWindowIsFloating == false) {
            // default value
Solution content 
    }

    private void findStatusBar(RenderResources resources, DisplayMetrics metrics) {
        boolean windowFullscreen = getBooleanThemeValue(resources,
                "windowFullscreen", false /*defaultValue*/);

        if (windowFullscreen == false && mWindowIsFloating == false) {
            // default value
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable