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

Commit 69eb2107 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis." 

* commit '4fec1b48':
  Use constants instead of resources for ellipsis.
parents 8ab25d82 4fec1b48

core/java/android/text/TextUtils.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -63,6 +63,8 @@ import java.util.regex.Pattern; 




public class TextUtils {

public class TextUtils {

    private static final String TAG = "TextUtils";

    private static final String TAG = "TextUtils";

    private static final String ELLIPSIS = new String(Layout.ELLIPSIS_NORMAL);

    private static final String ELLIPSIS_TWO_DOTS = new String(Layout.ELLIPSIS_TWO_DOTS);









    private TextUtils() { /* cannot be instantiated */ }

    private TextUtils() { /* cannot be instantiated */ }
@@ -1081,14 +1083,9 @@ public class TextUtils { 
                                         float avail, TruncateAt where,

                                         float avail, TruncateAt where,

                                         boolean preserveLength,

                                         boolean preserveLength,

                                         EllipsizeCallback callback) {

                                         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,

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

                TextDirectionHeuristics.FIRSTSTRONG_LTR,

                TextDirectionHeuristics.FIRSTSTRONG_LTR,

                ellipsis);

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

    }

    }





    /**

    /**

core/res/res/values/strings.xml

+0 −8
Original line number Original line Diff line number Diff line
@@ -79,14 +79,6 @@ 
         for a note with no name. -->

         for a note with no name. -->

    <string name="untitled">&lt;Untitled&gt;</string>

    <string name="untitled">&lt;Untitled&gt;</string>





    <!-- Used to replace a range of characters in text that is too wide

         for the space allocated to it (three dots). -->

    <string name="ellipsis">\u2026</string>



    <!-- Used to replace a range of characters in text that is too wide

         for the space allocated to it (two dots). -->

    <string name="ellipsis_two_dots">\u2025</string>



    <!-- How to display the lack of a phone number -->

    <!-- How to display the lack of a phone number -->

    <string name="emptyPhoneNumber">(No phone number)</string>

    <string name="emptyPhoneNumber">(No phone number)</string>