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

Commit e89ad6c2 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work... 

am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev

* commit 'd63b9922':
  Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed
parents e189e544 d63b9922

core/java/android/text/TextUtils.java

+6 −6
Original line number Diff line number Diff line
@@ -1042,9 +1042,14 @@ public class TextUtils { 
                                         float avail, TruncateAt where,

                                         boolean preserveLength,

                                         EllipsizeCallback callback) {



        final String ellipsis = (where == TruncateAt.END_SMALL) ?

                Resources.getSystem().getString(R.string.ellipsis_two_dots) :

                Resources.getSystem().getString(R.string.ellipsis);



        return ellipsize(text, paint, avail, where, preserveLength, callback,

                TextDirectionHeuristics.FIRSTSTRONG_LTR,

                (where == TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS_NORMAL);

                ellipsis);

    }



    /**
@@ -1700,9 +1705,4 @@ public class TextUtils { 
    private static String[] EMPTY_STRING_ARRAY = new String[]{};



    private static final char ZWNBS_CHAR = '\uFEFF';



    private static final String ELLIPSIS_NORMAL = Resources.getSystem().getString(

            R.string.ellipsis);

    private static final String ELLIPSIS_TWO_DOTS = Resources.getSystem().getString(

            R.string.ellipsis_two_dots);

}