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

Commit 8d00fb41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Suppress API lint for FontFamily and LineBreakConfig" into main

parents efc4b33a 8e0f7406

graphics/java/android/graphics/fonts/FontFamily.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.text.FontConfig;

import android.util.SparseIntArray;
@@ -151,6 +152,7 @@ public final class FontFamily { 
         * @return A variable font family. null if a variable font cannot be built from the given

         *         fonts.

         */

        @SuppressLint("BuilderSetStyle")

        @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML)

        public @Nullable FontFamily buildVariableFamily() {

            int variableFamilyType = analyzeAndResolveVariableType(mFonts);

graphics/java/android/graphics/text/LineBreakConfig.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.FlaggedApi; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.app.ActivityThread;

import android.os.Build;

import android.os.LocaleList;
@@ -314,6 +315,7 @@ public final class LineBreakConfig implements Parcelable { 
         * @param config an override line break config

         * @return This {@code Builder}.

         */

        @SuppressLint("BuilderSetStyle")

        @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)

        public @NonNull Builder merge(@NonNull LineBreakConfig config) {

            if (config.mLineBreakStyle != LINE_BREAK_STYLE_UNSPECIFIED) {