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

Commit 882299be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong Nullability of BoringLayout new API introduced in API33" into... 

Merge "Fix wrong Nullability of BoringLayout new API introduced in API33" into tm-dev am: 90b2bfd4

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

Change-Id: I461e75cf5fc32e73183b2915ce9a573ea1ec7a26
parents 5df3a2d3 90b2bfd4

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -44820,7 +44820,7 @@ package android.text { 
  public class BoringLayout extends android.text.Layout implements android.text.TextUtils.EllipsizeCallback {

    ctor public BoringLayout(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);

    ctor public BoringLayout(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);

    ctor public BoringLayout(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, float, float, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    ctor public BoringLayout(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, float, float, @NonNull android.text.BoringLayout.Metrics, boolean, @Nullable android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    method public void ellipsized(int, int);

    method public int getBottomPadding();

    method public int getEllipsisCount(int);
@@ -44838,9 +44838,9 @@ package android.text { 
    method @Nullable public static android.text.BoringLayout.Metrics isBoring(@NonNull CharSequence, @NonNull android.text.TextPaint, @NonNull android.text.TextDirectionHeuristic, boolean, @Nullable android.text.BoringLayout.Metrics);

    method public static android.text.BoringLayout make(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);

    method public static android.text.BoringLayout make(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);

    method @NonNull public static android.text.BoringLayout make(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    method @NonNull public static android.text.BoringLayout make(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @Nullable android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    method public android.text.BoringLayout replaceOrMake(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);

    method @NonNull public android.text.BoringLayout replaceOrMake(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    method @NonNull public android.text.BoringLayout replaceOrMake(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @Nullable android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);

    method public android.text.BoringLayout replaceOrMake(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);

  }

























core/java/android/text/BoringLayout.java



+6
−6






























Original line number
Diff line number
Diff line








@@ -103,7 +103,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













     * @param includePad set whether to include extra space beyond font ascent and descent which is















     *                   needed to avoid clipping in some scripts















     * @param ellipsize whether to ellipsize the text if width of the text is longer than the













     *                  requested width













     *                  requested width. null if ellipsis is not applied.















     * @param ellipsizedWidth the width to which this Layout is ellipsizing. If {@code ellipsize} is















     *                        {@code null}, or is {@link TextUtils.TruncateAt#MARQUEE} this value is















     *                        not used, {@code outerWidth} is used instead









@@ -116,7 +116,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













            @NonNull CharSequence source, @NonNull TextPaint paint,















            @IntRange(from = 0) int outerWidth,















            @NonNull Alignment align, @NonNull BoringLayout.Metrics metrics,













            boolean includePad, @NonNull TextUtils.TruncateAt ellipsize,













            boolean includePad, @Nullable TextUtils.TruncateAt ellipsize,















            @IntRange(from = 0) int ellipsizedWidth, boolean useFallbackLineSpacing) {















        return new BoringLayout(source, paint, outerWidth, align, 1f, 0f, metrics, includePad,















                ellipsize, ellipsizedWidth, useFallbackLineSpacing);










@@ -170,7 +170,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













     * @param includePad set whether to include extra space beyond font ascent and descent which is















     *                   needed to avoid clipping in some scripts















     * @param ellipsize whether to ellipsize the text if width of the text is longer than the













     *                  requested width













     *                  requested width. null if ellipsis not applied.















     * @param ellipsizedWidth the width to which this Layout is ellipsizing. If {@code ellipsize} is















     *                        {@code null}, or is {@link TextUtils.TruncateAt#MARQUEE} this value is















     *                        not used, {@code outerWidth} is used instead









@@ -182,7 +182,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













    public @NonNull BoringLayout replaceOrMake(@NonNull CharSequence source,















            @NonNull TextPaint paint, @IntRange(from = 0) int outerWidth,















            @NonNull Alignment align, @NonNull BoringLayout.Metrics metrics, boolean includePad,













            @NonNull TextUtils.TruncateAt ellipsize, @IntRange(from = 0) int ellipsizedWidth,













            @Nullable TextUtils.TruncateAt ellipsize, @IntRange(from = 0) int ellipsizedWidth,















            boolean useFallbackLineSpacing) {















        boolean trust;


























@@ -298,7 +298,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













     * @param includePad set whether to include extra space beyond font ascent and descent which is















     *                   needed to avoid clipping in some scripts















     * @param ellipsize whether to ellipsize the text if width of the text is longer than the













     *                  requested {@code outerWidth}













     *                  requested {@code outerWidth}. null if ellipsis is not applied.















     * @param ellipsizedWidth the width to which this Layout is ellipsizing. If {@code ellipsize} is















     *                        {@code null}, or is {@link TextUtils.TruncateAt#MARQUEE} this value is















     *                        not used, {@code outerWidth} is used instead









@@ -311,7 +311,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback













            @NonNull CharSequence source, @NonNull TextPaint paint,















            @IntRange(from = 0) int outerWidth, @NonNull Alignment align, float spacingMult,















            float spacingAdd, @NonNull BoringLayout.Metrics metrics, boolean includePad,













            @NonNull TextUtils.TruncateAt ellipsize, @IntRange(from = 0) int ellipsizedWidth,













            @Nullable TextUtils.TruncateAt ellipsize, @IntRange(from = 0) int ellipsizedWidth,















            boolean useFallbackLineSpacing) {















        /*















         * It is silly to have to call super() and then replaceWith(),