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

Commit 193ec535 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set useFallbackLineSPacing into member value" into tm-dev am: ee06c566 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17288890

Change-Id: I14aafca4d40f7035c14b015b55befcdc96b5ec6d
parents a874dbf4 ee06c566

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);

    }