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

Commit 63a5efb4 authored by Haoyu Zhang's avatar Haoyu Zhang
Browse files

Make LineHeightSpan.Standard a ParcelableSpan 

Implement ParcelableSpan interface for LineHeightSpan.

Bug: 112621694
Test: atest LineHeightSpan_StandardTest
Change-Id: I452a2b12310b525555e908e4d04dda7101693319
parent 898dd650

api/current.txt

+6 −1
Original line number Diff line number Diff line
@@ -45614,9 +45614,14 @@ package android.text.style { 
    method public abstract void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);

  }













  public static class LineHeightSpan.Standard implements android.text.style.LineHeightSpan {













  public static class LineHeightSpan.Standard implements android.text.style.LineHeightSpan android.text.ParcelableSpan {















    ctor public LineHeightSpan.Standard(int);













    ctor public LineHeightSpan.Standard(android.os.Parcel);















    method public void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);













    method public int describeContents();













    method public int getHeight();













    method public int getSpanTypeId();













    method public void writeToParcel(android.os.Parcel, int);















  }





























  public static abstract interface LineHeightSpan.WithDensity implements android.text.style.LineHeightSpan {

























core/java/android/text/TextUtils.java



+8
−1




























Original line number
Diff line number
Diff line








@@ -46,6 +46,7 @@ import android.text.style.EasyEditSpan;













import android.text.style.ForegroundColorSpan;















import android.text.style.LeadingMarginSpan;















import android.text.style.LineBackgroundSpan;













import android.text.style.LineHeightSpan;















import android.text.style.LocaleSpan;















import android.text.style.ParagraphStyle;















import android.text.style.QuoteSpan;










@@ -733,7 +734,9 @@ public class TextUtils {













    /** @hide */















    public static final int LINE_BACKGROUND_SPAN = 27;















    /** @hide */













    public static final int LAST_SPAN = LINE_BACKGROUND_SPAN;













    public static final int LINE_HEIGHT_SPAN = 28;













    /** @hide */













    public static final int LAST_SPAN = LINE_HEIGHT_SPAN;































    /**















     * Flatten a CharSequence and whatever styles can be copied across processes










@@ -928,6 +931,10 @@ public class TextUtils {













                    readSpan(p, sp, new LineBackgroundSpan.Standard(p));















                    break;





























                case LINE_HEIGHT_SPAN:













                    readSpan(p, sp, new LineHeightSpan.Standard(p));













                    break;













                    















                default:















                    throw new RuntimeException("bogus span encoding " + kind);















                }

































core/java/android/text/style/LineHeightSpan.java



+46
−1




























Original line number
Diff line number
Diff line








@@ -20,7 +20,10 @@ import android.annotation.IntRange;













import android.annotation.NonNull;















import android.annotation.Px;















import android.graphics.Paint;













import android.os.Parcel;













import android.text.ParcelableSpan;















import android.text.TextPaint;













import android.text.TextUtils;































import com.android.internal.util.Preconditions;


























@@ -71,7 +74,7 @@ public interface LineHeightSpan extends ParagraphStyle, WrapTogetherSpan {













     * covers only part of the paragraph.















     * </p>















     */













    class Standard implements LineHeightSpan {













    class Standard implements LineHeightSpan, ParcelableSpan {































        private final @Px int mHeight;















        /**









@@ -82,6 +85,48 @@ public interface LineHeightSpan extends ParagraphStyle, WrapTogetherSpan {













            mHeight = height;















        }





























        /**













         * Constructor called from {@link TextUtils} to restore the span from a parcel













         */













        public Standard(Parcel src) {













            mHeight = src.readInt();













        }



























        /**













         * Returns the line height specified by this span.













         */













        @Px













        public int getHeight() {













            return mHeight;













        }



























        @Override













        public int getSpanTypeId() {













            return getSpanTypeIdInternal();













        }



























        /** @hide */













        @Override













        public int getSpanTypeIdInternal() {













            return TextUtils.LINE_HEIGHT_SPAN;













        }



























        @Override













        public int describeContents() {













            return 0;













        }



























        @Override













        public void writeToParcel(Parcel dest, int flags) {













            writeToParcelInternal(dest, flags);













        }



























        /** @hide */













        @Override













        public void writeToParcelInternal(@NonNull Parcel dest, int flags) {













            dest.writeInt(mHeight);













        }





























        @Override















        public void chooseHeight(@NonNull CharSequence text, int start, int end,















                int spanstartv, int lineHeight,