Projects >> android-frameworks-base-with-screenshot-tweaks >>e1918353e795d4f4fb67760ad593458517976072

Chunk
Conflicting content 
        return getParams().getConfigScreenSize() == ScreenSize.XLARGE;
    }

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

            if (windowFullscreen == false && mWindowIsFloating == false) {
                // default value
                mStatusBarSize = DEFAULT_STATUS_BAR_HEIGHT;

                // get the real value
                ResourceValue value = resources.getFrameworkResource(ResourceType.DIMEN,
                        "status_bar_height");

                if (value != null) {
                    TypedValue typedValue = ResourceHelper.getValue("status_bar_height",
                            value.getValue(), true /*requireUnit*/);
                    if (typedValue != null) {
                        // compute the pixel value based on the display metrics
                        mStatusBarSize = (int)typedValue.getDimension(metrics);
                    }
=======
            if (value != null) {
                TypedValue typedValue = ResourceHelper.getValue("status_bar_height",
                        value.getValue(), true /*requireUnit*/);
                if (typedValue != null) {
                    // compute the pixel value based on the display metrics
                    mStatusBarSize = (int)typedValue.getDimension(metrics);
>>>>>>> 842725fc642b7ba2c087cc81796973b838c23c76
                }
            }
        }
Solution content 
        }
        return getParams().getConfigScreenSize() == ScreenSize.XLARGE;
    }

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

            if (windowFullscreen == false && mWindowIsFloating == false) {
                // default value
                mStatusBarSize = DEFAULT_STATUS_BAR_HEIGHT;

                // get the real value
                ResourceValue value = resources.getFrameworkResource(ResourceType.DIMEN,
                        "status_bar_height");

                if (value != null) {
                    TypedValue typedValue = ResourceHelper.getValue("status_bar_height",
                            value.getValue(), true /*requireUnit*/);
                    if (typedValue != null) {
                        // compute the pixel value based on the display metrics
                        mStatusBarSize = (int)typedValue.getDimension(metrics);
                    }
                }
            }
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Comment
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
                // get the numerical value, if available
                TypedValue typedValue = ResourceHelper.getValue("actionBarSize", value.getValue(),
                        true /*requireUnit*/);
<<<<<<< HEAD
                if (typedValue != null) {
                    // compute the pixel value based on the display metrics
                    mActionBarSize = (int)typedValue.getDimension(metrics);
                }
            }
        } else {
            // action bar overrides title bar so only look for this one if action bar is hidden
            boolean windowNoTitle = getBooleanThemeValue(resources,
                    "windowNoTitle", false /*defaultValue*/);

            if (windowNoTitle == false) {

                // default size of the window title bar
                mTitleBarSize = DEFAULT_TITLE_BAR_HEIGHT;

                // get value from the theme.
                ResourceValue value = resources.findItemInTheme("windowTitleSize");

                // resolve it
                value = resources.resolveResValue(value);

                if (value != null) {
                    // get the numerical value, if available
                    TypedValue typedValue = ResourceHelper.getValue("windowTitleSize",
                            value.getValue(), true /*requireUnit*/);
                    if (typedValue != null) {
                        // compute the pixel value based on the display metrics
                        mTitleBarSize = (int)typedValue.getDimension(metrics);
                    }
                }
            }

        }
    }

    private void findSystemBar(RenderResources resources, DisplayMetrics metrics) {
        if (isTabletUi() && mWindowIsFloating == false) {

            // default value
            mSystemBarSize = 48; // ??

            // get the real value
            ResourceValue value = resources.getFrameworkResource(ResourceType.DIMEN,
                    "status_bar_height");

            if (value != null) {
                TypedValue typedValue = ResourceHelper.getValue("status_bar_height",
                        value.getValue(), true /*requireUnit*/);
=======
>>>>>>> 842725fc642b7ba2c087cc81796973b838c23c76
                if (typedValue != null) {
                    // compute the pixel value based on the display metrics
                    mSystemBarSize = (int)typedValue.getDimension(metrics);
Solution content 
                // get the numerical value, if available
                TypedValue typedValue = ResourceHelper.getValue("actionBarSize", value.getValue(),
                        true /*requireUnit*/);
                if (typedValue != null) {
                    // compute the pixel value based on the display metrics
                    mActionBarSize = (int)typedValue.getDimension(metrics);
                }
            }
        } else {
            // action bar overrides title bar so only look for this one if action bar is hidden
            boolean windowNoTitle = getBooleanThemeValue(resources,
                    "windowNoTitle", false /*defaultValue*/);

            if (windowNoTitle == false) {

                // default size of the window title bar
                mTitleBarSize = DEFAULT_TITLE_BAR_HEIGHT;

                // get value from the theme.
                ResourceValue value = resources.findItemInTheme("windowTitleSize");

                // resolve it
                value = resources.resolveResValue(value);

                if (value != null) {
                    // get the numerical value, if available
                    TypedValue typedValue = ResourceHelper.getValue("windowTitleSize",
                            value.getValue(), true /*requireUnit*/);
                    if (typedValue != null) {
                        // compute the pixel value based on the display metrics
                        mTitleBarSize = (int)typedValue.getDimension(metrics);
                    }
                }
            }

        }
    }

    private void findSystemBar(RenderResources resources, DisplayMetrics metrics) {
        if (isTabletUi() && mWindowIsFloating == false) {

            // default value
            mSystemBarSize = 48; // ??

            // get the real value
            ResourceValue value = resources.getFrameworkResource(ResourceType.DIMEN,
                    "status_bar_height");

            if (value != null) {
                TypedValue typedValue = ResourceHelper.getValue("status_bar_height",
                        value.getValue(), true /*requireUnit*/);
                if (typedValue != null) {
                    // compute the pixel value based on the display metrics
                    mSystemBarSize = (int)typedValue.getDimension(metrics);
File
RenderSessionImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Variable