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

Commit 46dd24a7 authored by Siyamed Sinir's avatar Siyamed Sinir
Browse files

Fix imports in text related graphics classes 

Test: atest CanvasTest
Test: atest TypefaceTest
Test: atest PaintTest

Change-Id: I0d022e39a68be1b22d3036e928eaec1929789261
parent bcaeb104

graphics/java/android/graphics/BaseCanvas.java

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.Nullable; 
import android.annotation.Size;

import android.graphics.Canvas.VertexMode;

import android.text.GraphicsOperations;

import android.text.MeasuredParagraph;

import android.text.MeasuredText;

import android.text.SpannableString;

import android.text.SpannedString;

graphics/java/android/graphics/FontFamily.java

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ package android.graphics; 
import android.annotation.Nullable;

import android.content.res.AssetManager;

import android.graphics.fonts.FontVariationAxis;

import android.text.FontConfig;

import android.text.TextUtils;

import android.util.Log;



import dalvik.annotation.optimization.CriticalNative;



import java.io.FileInputStream;

graphics/java/android/graphics/FontListParser.java

+1 −4
Original line number Diff line number Diff line
@@ -16,16 +16,13 @@ 


package android.graphics;



import android.text.FontConfig;

import android.graphics.fonts.FontVariationAxis;

import android.text.FontConfig;

import android.util.Xml;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.annotation.Nullable;

import com.android.internal.annotations.VisibleForTesting;



import java.io.IOException;

import java.io.InputStream;

import java.util.ArrayList;

graphics/java/android/graphics/Paint.java

+2 −5
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ package android.graphics; 
import android.annotation.ColorInt;

import android.annotation.NonNull;

import android.annotation.Size;

import android.graphics.FontListParser;

import android.graphics.fonts.FontVariationAxis;

import android.os.LocaleList;

import android.text.FontConfig;

import android.text.GraphicsOperations;

import android.text.SpannableString;

import android.text.SpannedString;
@@ -33,14 +31,13 @@ import com.android.internal.annotations.GuardedBy; 
import dalvik.annotation.optimization.CriticalNative;

import dalvik.annotation.optimization.FastNative;



import libcore.util.NativeAllocationRegistry;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashMap;

import java.util.Locale;



import libcore.util.NativeAllocationRegistry;



/**

 * The Paint class holds the style and color information about how to draw

 * geometries, text and bitmaps.

graphics/java/android/graphics/Typeface.java

+10 −26
Original line number Diff line number Diff line
@@ -16,25 +16,17 @@ 


package android.graphics;



import static android.content.res.FontResourcesParser.ProviderResourceEntry;

import static android.content.res.FontResourcesParser.FontFileResourceEntry;

import static android.content.res.FontResourcesParser.FontFamilyFilesResourceEntry;

import static android.content.res.FontResourcesParser.FamilyResourceEntry;

import static android.content.res.FontResourcesParser.FontFamilyFilesResourceEntry;

import static android.content.res.FontResourcesParser.FontFileResourceEntry;

import static android.content.res.FontResourcesParser.ProviderResourceEntry;



import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.res.AssetManager;

import android.graphics.FontListParser;

import android.graphics.fonts.FontVariationAxis;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.ParcelFileDescriptor;

import android.os.ResultReceiver;

import android.provider.FontRequest;

import android.provider.FontsContract;

import android.text.FontConfig;
@@ -49,8 +41,6 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;



import libcore.io.IoUtils;



import org.xmlpull.v1.XmlPullParserException;



import java.io.File;
@@ -58,19 +48,15 @@ import java.io.FileDescriptor; 
import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.io.InputStream;

import java.nio.ByteBuffer;

import java.nio.channels.FileChannel;

import java.util.Arrays;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.atomic.AtomicReference;



/**

 * The Typeface class specifies the typeface and intrinsic style of a font.
@@ -395,7 +381,7 @@ public class Typeface { 
         * weight and italic information, so {@link #setWeight} and {@link #setItalic} are used

         * for style matching during font selection.

         *

         * @param results The array of {@link FontsContract.FontInfo}

         * @param fonts The array of {@link FontsContract.FontInfo}

         * @param buffers The mapping from URI to buffers to be used during building.

         * @hide

         */
@@ -879,14 +865,12 @@ public class Typeface { 
     * also the font families in the fallback list.

     * @param fallbackName the family name. If given families don't support characters, the

     *               characters will be rendered with this family.

     * @param weight the weight for this family. {@link RESOLVE_BY_FONT_TABLE} can be used. In that

     *               case, the table information in the first family's font is used. If the first

     *               family has multiple fonts, the closest to the regular weight and upright font

     *               is used.

     * @param italic the italic information for this family. {@link RESOLVE_BY_FONT_TABLE} can be

     *               used. In that case, the table information in the first family's font is used.

     *               If the first family has multiple fonts, the closest to the regular weight and

     *               upright font is used.

     * @param weight the weight for this family. In that case, the table information in the first

     *               family's font is used. If the first family has multiple fonts, the closest to

     *               the regular weight and upright font is used.

     * @param italic the italic information for this family. In that case, the table information in

     *               the first family's font is used. If the first family has multiple fonts, the

     *               closest to the regular weight and upright font is used.

     * @param families array of font families

     */

    private static Typeface createFromFamiliesWithDefault(FontFamily[] families,