Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee06c566 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set useFallbackLineSPacing into member value" into tm-dev

parents c762d22d 41839339

core/java/android/text/BoringLayout.java

+5 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
        mEllipsizedWidth = outerwidth;

        mEllipsizedStart = 0;

        mEllipsizedCount = 0;

        mUseFallbackLineSpacing = false;



        init(source, paint, align, metrics, includePad, true, false /* useFallbackLineSpacing */);

        return this;
@@ -200,6 +201,8 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
            trust = false;

        }



        mUseFallbackLineSpacing = useFallbackLineSpacing;



        init(getText(), paint, align, metrics, includePad, trust,

                useFallbackLineSpacing);

        return this;
@@ -252,6 +255,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
        mEllipsizedWidth = outerwidth;

        mEllipsizedStart = 0;

        mEllipsizedCount = 0;

        mUseFallbackLineSpacing = false;



        init(source, paint, align, metrics, includePad, true, false /* useFallbackLineSpacing */);

    }
@@ -331,6 +335,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
            trust = false;

        }



        mUseFallbackLineSpacing = useFallbackLineSpacing;

        init(getText(), paint, align, metrics, includePad, trust, useFallbackLineSpacing);

    }