Projects information

Chunk

Conflicting content
if (ok != here) { // Log.e("text", "output ok " + here + " to " +ok); <<<<<<< HEAD while (ok < spanEnd && chs[ok - paraStart] == CHAR_SPACE) { ======= while (ok < spanEnd && chs[ok - paraStart] == ' ') { >>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1 ok++; }

Conflicting content

                            if (ok != here) {
                                // Log.e("text", "output ok " + here + " to " +ok);

<<<<<<< HEAD
                                while (ok < spanEnd && chs[ok - paraStart] == CHAR_SPACE) {
=======
                                while (ok < spanEnd && chs[ok - paraStart] == ' ') {
>>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1
                                    ok++;
                                }

Solution content
if (ok != here) { // Log.e("text", "output ok " + here + " to " +ok); while (ok < spanEnd && chs[ok - paraStart] == CHAR_SPACE) { ok++; }

File
StaticLayout.java

Developer's decision
Version 1

Kind of conflict
While statement

Chunk

Conflicting content
v = out(source, here, ok, <<<<<<< HEAD okAscent, okDescent, okTop, okBottom, v, spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, ok == bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, okWidth, ======= okascent, okdescent, oktop, okbottom, v, spacingmult, spacingadd, chooseht, choosehtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, ok == bufend, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, okwidth, >>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1 paint); here = ok;

Conflicting content

                                v = out(source,
                                        here, ok,
<<<<<<< HEAD
                                        okAscent, okDescent, okTop, okBottom,
                                        v,
                                        spacingmult, spacingadd, chooseHt,
                                        chooseHtv, fm, hasTabOrEmoji,
                                        needMultiply, paraStart, chdirs, dir, easy,
                                        ok == bufEnd, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, okWidth,
=======
                                        okascent, okdescent, oktop, okbottom,
                                        v,
                                        spacingmult, spacingadd, chooseht,
                                        choosehtv, fm, hasTabOrEmoji,
                                        needMultiply, paraStart, chdirs, dir, easy,
                                        ok == bufend, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, okwidth,
>>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1
                                        paint);

                                here = ok;

Solution content
v = out(source, here, ok, okAscent, okDescent, okTop, okBottom, v, spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, ok == bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, okWidth, paint); here = ok;

Solution content

                                v = out(source,
                                        here, ok,
                                        okAscent, okDescent, okTop, okBottom,
                                        v,
                                        spacingmult, spacingadd, chooseHt,
                                        chooseHtv, fm, hasTabOrEmoji,
                                        needMultiply, paraStart, chdirs, dir, easy,
                                        ok == bufEnd, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, okWidth,
                                        paint);

                                here = ok;

File
StaticLayout.java

Developer's decision
Version 1

Kind of conflict
Variable

Chunk

Conflicting content
spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, <<<<<<< HEAD fit == bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, fitWidth, ======= fit == bufend, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, fitwidth, >>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1 paint); here = fit;

Conflicting content

                                        spacingmult, spacingadd, chooseHt,
                                        chooseHtv, fm, hasTabOrEmoji,
                                        needMultiply, paraStart, chdirs, dir, easy,
<<<<<<< HEAD
                                        fit == bufEnd, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, fitWidth,
=======
                                        fit == bufend, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, fitwidth,
>>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1
                                        paint);

                                here = fit;

Solution content
spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, fit == bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, fitWidth, paint); here = fit;

Solution content

                                        spacingmult, spacingadd, chooseHt,
                                        chooseHtv, fm, hasTabOrEmoji,
                                        needMultiply, paraStart, chdirs, dir, easy,
                                        fit == bufEnd, includepad, trackpad,
                                        chs, widths, paraStart,
                                        ellipsize, ellipsizedWidth, fitWidth,
                                        paint);

                                here = fit;

File
StaticLayout.java

Developer's decision
Version 1

Kind of conflict
Variable

Chunk

Conflicting content
spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, <<<<<<< HEAD paraEnd == bufEnd, includepad, trackpad, ======= paraEnd == bufend, includepad, trackpad, >>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1 chs, widths, paraStart, ellipsize, ellipsizedWidth, w, paint); }

Conflicting content

                        spacingmult, spacingadd, chooseHt,
                        chooseHtv, fm, hasTabOrEmoji,
                        needMultiply, paraStart, chdirs, dir, easy,
<<<<<<< HEAD
                        paraEnd == bufEnd, includepad, trackpad,
=======
                        paraEnd == bufend, includepad, trackpad,
>>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1
                        chs, widths, paraStart,
                        ellipsize, ellipsizedWidth, w, paint);
            }

Solution content
spacingmult, spacingadd, chooseHt, chooseHtv, fm, hasTabOrEmoji, needMultiply, paraStart, chdirs, dir, easy, paraEnd == bufEnd, includepad, trackpad, chs, widths, paraStart, ellipsize, ellipsizedWidth, w, paint); }

Solution content

                        spacingmult, spacingadd, chooseHt,
                        chooseHtv, fm, hasTabOrEmoji,
                        needMultiply, paraStart, chdirs, dir, easy,
                        paraEnd == bufEnd, includepad, trackpad,
                        chs, widths, paraStart,
                        ellipsize, ellipsizedWidth, w, paint);
            }

File
StaticLayout.java

Developer's decision
Version 1

Kind of conflict
Variable

Chunk

Conflicting content
if (easy) { mLineDirections[j] = linedirs; } else { <<<<<<< HEAD mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widthStart, chs, start - widthStart, end - start); ======= mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widstart, chs, start - widstart, end - start); >>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1 } // If ellipsize is in marquee mode, do not apply ellipsis on the first line

Conflicting content

        if (easy) {
            mLineDirections[j] = linedirs;
        } else {
<<<<<<< HEAD
            mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widthStart, chs,
                    start - widthStart, end - start);
=======
            mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widstart, chs,
                    start - widstart, end - start);
>>>>>>> 166055b529987554644dc47cb5b29ce33a1ab5d1
        }

        // If ellipsize is in marquee mode, do not apply ellipsis on the first line

Solution content
if (easy) { mLineDirections[j] = linedirs; } else { mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widthStart, chs, start - widthStart, end - start); } // If ellipsize is in marquee mode, do not apply ellipsis on the first line

Solution content

        if (easy) {
            mLineDirections[j] = linedirs;
        } else {
            mLineDirections[j] = AndroidBidi.directions(dir, chdirs, start - widthStart, chs,
                    start - widthStart, end - start);
        }

        // If ellipsize is in marquee mode, do not apply ellipsis on the first line

File
StaticLayout.java

Developer's decision
Version 1

Kind of conflict
Array access
Method invocation

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