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

Commit d5287e60 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Add FontFamily.Builder instead of constructor 

Bug: 181124737
Test: atest FontFamilyUpdateRequestTest
Change-Id: I6fd9b7cb40e6f4d168f95953cb488b2c43d6abef
parent 5b718616

core/api/system-current.txt

+6 −1
Original line number Diff line number Diff line
@@ -2881,11 +2881,16 @@ package android.graphics.fonts { 
  }















  public static final class FontFamilyUpdateRequest.FontFamily {













    ctor public FontFamilyUpdateRequest.FontFamily(@NonNull String, @NonNull java.util.List<android.graphics.fonts.FontFamilyUpdateRequest.Font>);















    method @NonNull public java.util.List<android.graphics.fonts.FontFamilyUpdateRequest.Font> getFonts();















    method @NonNull public String getName();















  }



























  public static final class FontFamilyUpdateRequest.FontFamily.Builder {













    ctor public FontFamilyUpdateRequest.FontFamily.Builder(@NonNull String, @NonNull java.util.List<android.graphics.fonts.FontFamilyUpdateRequest.Font>);













    method @NonNull public android.graphics.fonts.FontFamilyUpdateRequest.FontFamily.Builder addFont(@NonNull android.graphics.fonts.FontFamilyUpdateRequest.Font);













    method @NonNull public android.graphics.fonts.FontFamilyUpdateRequest.FontFamily build();













  }



























  public final class FontFileUpdateRequest {















    ctor public FontFileUpdateRequest(@NonNull android.os.ParcelFileDescriptor, @NonNull byte[]);















    method @NonNull public android.os.ParcelFileDescriptor getParcelFileDescriptor();

































core/java/android/graphics/fonts/FontFamilyUpdateRequest.java



+40
−6




























Original line number
Diff line number
Diff line








@@ -72,6 +72,45 @@ public final class FontFamilyUpdateRequest {













     * A font family definition.















     */















    public static final class FontFamily {



























        /**













         * Builds a {@link FontFamily}.













         */













        public static final class Builder {













            @NonNull private final String mName;













            @NonNull private final List<Font> mFonts;



























            /**













             * Constructs a {@link FontFamily.Builder}.













             */













            public Builder(@NonNull String name, @NonNull List<Font> fonts) {













                Objects.requireNonNull(name);













                Preconditions.checkStringNotEmpty(name);













                Objects.requireNonNull(fonts);













                Preconditions.checkCollectionElementsNotNull(fonts, "fonts");













                Preconditions.checkCollectionNotEmpty(fonts, "fonts");













                mName = name;













                mFonts = new ArrayList<>(fonts);













            }



























            /**













             * Adds a {@link Font} to the builder.













             *













             * @return This builder object.













             */













            public @NonNull Builder addFont(@NonNull Font font) {













                mFonts.add(font);













                return this;













            }



























            /**













             * Builds a {@link FontFamily}.













             */













            public @NonNull FontFamily build() {













                return new FontFamily(mName, mFonts);













            }













        }





























        @NonNull















        private final String mName;















        @NonNull









@@ -90,12 +129,7 @@ public final class FontFamilyUpdateRequest {













         * @see android.graphics.Typeface#create(String, int)















         * @see Font















         */













        public FontFamily(@NonNull String name, @NonNull List<Font> fonts) {













            Objects.requireNonNull(name);













            Preconditions.checkStringNotEmpty(name);













            Objects.requireNonNull(fonts);













            Preconditions.checkCollectionElementsNotNull(fonts, "fonts");













            Preconditions.checkCollectionNotEmpty(fonts, "fonts");













        private FontFamily(@NonNull String name, @NonNull List<Font> fonts) {















            mName = name;















            mFonts = fonts;















        }