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

Commit a8e1bac6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix imports in android.text package."

parents ec726547 4037d51b

core/java/android/text/AutoText.java

+7 −8
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ package android.text; 


import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.view.View;



import com.android.internal.util.XmlUtils;



import android.view.View;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

core/java/android/text/BidiFormatter.java

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package android.text;



import static android.text.TextDirectionHeuristics.FIRSTSTRONG_LTR;



import android.annotation.Nullable;

import android.view.View;



import static android.text.TextDirectionHeuristics.FIRSTSTRONG_LTR;



import java.util.Locale;



/**

core/java/android/text/Html.java

+11 −12
Original line number Diff line number Diff line
@@ -16,19 +16,8 @@ 


package android.text;



import com.android.internal.util.ArrayUtils;

import org.ccil.cowan.tagsoup.HTMLSchema;

import org.ccil.cowan.tagsoup.Parser;

import org.xml.sax.Attributes;

import org.xml.sax.ContentHandler;

import org.xml.sax.InputSource;

import org.xml.sax.Locator;

import org.xml.sax.SAXException;

import org.xml.sax.XMLReader;



import android.app.ActivityThread;

import android.app.Application;

import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Typeface;
@@ -47,11 +36,21 @@ import android.text.style.StrikethroughSpan; 
import android.text.style.StyleSpan;

import android.text.style.SubscriptSpan;

import android.text.style.SuperscriptSpan;

import android.text.style.TextAppearanceSpan;

import android.text.style.TypefaceSpan;

import android.text.style.URLSpan;

import android.text.style.UnderlineSpan;



import com.android.internal.util.ArrayUtils;



import org.ccil.cowan.tagsoup.HTMLSchema;

import org.ccil.cowan.tagsoup.Parser;

import org.xml.sax.Attributes;

import org.xml.sax.ContentHandler;

import org.xml.sax.InputSource;

import org.xml.sax.Locator;

import org.xml.sax.SAXException;

import org.xml.sax.XMLReader;



import java.io.IOException;

import java.io.StringReader;

import java.util.HashMap;

core/java/android/text/InputType.java

+38 −40
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.text;



import android.text.TextUtils;



/**

 * Bit definitions for an integer defining the basic content type of text

 * held in an {@link Editable} object. Supported classes may be combined

core/java/android/text/TextLine.java

+0 −2
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ 


package android.text;



import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Paint.FontMetricsInt;

import android.graphics.RectF;

import android.text.Layout.Directions;

import android.text.Layout.TabStops;

import android.text.style.CharacterStyle;