Projects >> platform_frameworks_base >>23a7bc9cc65952c6127ccbbdce6c80fc4c04e89a

Chunk
Conflicting content 
    /** Navigation bar background color attribute name. */
    private static final String ATTR_COLOR = "navigationBarColor";
<<<<<<< HEAD
    /** Attribute for translucency property. */
    public static final String ATTR_TRANSLUCENT = "windowTranslucentNavigation";
=======
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1
    // These correspond to @dimen/navigation_side_padding in the system ui code.
    private static final int PADDING_WIDTH_DEFAULT = 36;
    private static final int PADDING_WIDTH_SW360 = 40;
Solution content 
    /** Navigation bar background color attribute name. */
    private static final String ATTR_COLOR = "navigationBarColor";
    /** Attribute for translucency property. */
    public static final String ATTR_TRANSLUCENT = "windowTranslucentNavigation";
    // These correspond to @dimen/navigation_side_padding in the system ui code.
    private static final int PADDING_WIDTH_DEFAULT = 36;
    private static final int PADDING_WIDTH_SW360 = 40;
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
    private static final int WIDTH_DEFAULT = 36;
    private static final int WIDTH_SW360 = 40;
    private static final int WIDTH_SW600 = 48;
<<<<<<< HEAD
    private static final String LAYOUT_XML = "/bars/navigation_bar.xml";
    private static final String LAYOUT_600DP_XML = "/bars/navigation_bar600dp.xml";

=======
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1

    /**
     * Constructor to be used when creating the {@link NavigationBar} as a regular control.
Solution content 
    private static final int WIDTH_DEFAULT = 36;
    private static final int WIDTH_SW360 = 40;
    private static final int WIDTH_SW600 = 48;
    private static final String LAYOUT_XML = "/bars/navigation_bar.xml";
    private static final String LAYOUT_600DP_XML = "/bars/navigation_bar600dp.xml";


    /**
     * Constructor to be used when creating the {@link NavigationBar} as a regular control.
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    }

    private void setupNavBar(BridgeContext context, int orientation) {
<<<<<<< HEAD
        float sw = getShortestWidth(context);
        View leftPadding = getChildAt(0);
        View rightPadding = getChildAt(6);
        setSize(context, leftPadding, orientation, getSidePadding(sw));
        setSize(context, rightPadding, orientation, getSidePadding(sw));
        int navButtonWidth = getWidth(sw);
        for (int i = 1; i < 6; i += 2) {
            View navButton = getChildAt(i);
            setSize(context, navButton, orientation, navButtonWidth);
        }
        if (sw >= 600) {
            setSize(context, getChildAt(2), orientation, 128);
            setSize(context, getChildAt(4), orientation, 128);
=======
        View leftPadding = getChildAt(0);
        View rightPadding = getChildAt(6);
        setSize(context, leftPadding, orientation, getSidePadding(context));
        setSize(context, rightPadding, orientation, getSidePadding(context));
        for (int i = 1; i < 6; i += 2) {
            View navButton = getChildAt(i);
            setSize(context, navButton, orientation, getWidth(context));
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1
        }
    }
Solution content 
    }

    private void setupNavBar(BridgeContext context, int orientation) {
        float sw = getShortestWidth(context);
        View leftPadding = getChildAt(0);
        View rightPadding = getChildAt(6);
        setSize(context, leftPadding, orientation, getSidePadding(sw));
        setSize(context, rightPadding, orientation, getSidePadding(sw));
        int navButtonWidth = getWidth(sw);
        for (int i = 1; i < 6; i += 2) {
            View navButton = getChildAt(i);
            setSize(context, navButton, orientation, navButtonWidth);
        }
        if (sw >= 600) {
            setSize(context, getChildAt(2), orientation, 128);
            setSize(context, getChildAt(4), orientation, 128);
        }
    }
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
        view.setLayoutParams(layoutParams);
    }

<<<<<<< HEAD
    private static int getSidePadding(float sw) {
=======
    private static int getSidePadding(BridgeContext context) {
        DisplayMetrics metrics = context.getMetrics();
        float sw = metrics.widthPixels > metrics.heightPixels
                ? metrics.heightPixels : metrics.widthPixels;
        sw /= metrics.density;
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1
        if (sw >= 400) {
            return PADDING_WIDTH_SW400;
        }
Solution content 
        view.setLayoutParams(layoutParams);
    }

    private static int getSidePadding(float sw) {
        if (sw >= 400) {
            return PADDING_WIDTH_SW400;
        }
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        return PADDING_WIDTH_DEFAULT;
    }

<<<<<<< HEAD
    private static int getWidth(float sw) {
=======
    private static int getWidth(BridgeContext context) {
        DisplayMetrics metrics = context.getMetrics();
        float sw = metrics.widthPixels > metrics.heightPixels
                ? metrics.heightPixels : metrics.widthPixels;
        sw /= metrics.density;
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1
        if (sw >= 600) {
            return WIDTH_SW600;
        }
Solution content 
        return PADDING_WIDTH_DEFAULT;
    }

    private static int getWidth(float sw) {
        if (sw >= 600) {
            return WIDTH_SW600;
        }
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
            return WIDTH_SW360;
        }
        return WIDTH_DEFAULT;
<<<<<<< HEAD
    }

    private static float getShortestWidth(BridgeContext context) {
        DisplayMetrics metrics = context.getMetrics();
        float sw = metrics.widthPixels < metrics.heightPixels ?
                metrics.widthPixels : metrics.heightPixels;
        sw /= metrics.density;
        return sw;
=======
>>>>>>> 6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1
    }

    @Override
Solution content 
            return WIDTH_SW360;
        }
        return WIDTH_DEFAULT;
    }

    private static float getShortestWidth(BridgeContext context) {
        DisplayMetrics metrics = context.getMetrics();
        float sw = metrics.widthPixels < metrics.heightPixels ?
                metrics.widthPixels : metrics.heightPixels;
        sw /= metrics.density;
        return sw;
    }

    @Override
File
NavigationBar.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Variable