Projects >> platform_frameworks_base >>1a91d8df50562510084cd041501a3099f962a71c

Chunk
Conflicting content
            float[] lineWidths = lineBreaks.widths;
            boolean[] flags = lineBreaks.flags;

<<<<<<< HEAD
=======
                        int ellipseEnd = endPos;
                        if (mMaximumVisibleLineCount == 1 && ellipsize == TextUtils.TruncateAt.MIDDLE) {
                            ellipseEnd = paraEnd;
                        }
                        v = out(source, here, ellipseEnd,
                                above, below, top, bottom,
                                v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, hasTabOrEmoji,
                                needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad,
                                chs, widths, paraStart, ellipsize, ellipsizedWidth,
                                currentTextWidth, paint, true);

                        here = endPos;
                        j = here - 1; // restart j-span loop from here, compensating for the j++
                        ok = fit = here;
                        w = 0;
                        fitWidthGraphing = w;
                        fitAscent = fitDescent = fitTop = fitBottom = 0;
                        okAscent = okDescent = okTop = okBottom = 0;

                        if (--firstWidthLineLimit <= 0) {
                            width = restWidth;
                        }
>>>>>>> b9d21d623f8bb196831d6fabdd5bb2ecf73a0c31

            // here is the offset of the starting character of the line we are currently measuring
            int here = paraStart;
Solution content
            float[] lineWidths = lineBreaks.widths;
            boolean[] flags = lineBreaks.flags;

            // here is the offset of the starting character of the line we are currently measuring
            int here = paraStart;
File
StaticLayout.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable