diff options
35 files changed, 186 insertions, 177 deletions
diff --git a/core/java/android/text/AutoText.java b/core/java/android/text/AutoText.java index 04730ecd6cdd..c5339a42cbd1 100644 --- a/core/java/android/text/AutoText.java +++ b/core/java/android/text/AutoText.java @@ -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; @@ -97,10 +96,10 @@ public class AutoText { sInstance = instance; } } - + return instance; } - + /** * Retrieves a possible spelling correction for the specified range * of text. Returns null if no correction can be found. @@ -119,7 +118,7 @@ public class AutoText { */ public static int getSize(View view) { - return getInstance(view).getSize(); + return getInstance(view).getSize(); } /** @@ -137,7 +136,7 @@ public class AutoText { for (; here != TRIE_NULL; here = mTrie[here + TRIE_NEXT]) { if (c == mTrie[here + TRIE_C]) { - if ((i == end - 1) + if ((i == end - 1) && (mTrie[here + TRIE_OFF] != TRIE_NULL)) { int off = mTrie[here + TRIE_OFF]; int len = mText.charAt(off); @@ -174,7 +173,7 @@ public class AutoText { while (true) { XmlUtils.nextElement(parser); - String element = parser.getName(); + String element = parser.getName(); if (element == null || !(element.equals("word"))) { break; } @@ -214,7 +213,7 @@ public class AutoText { int herep = TRIE_ROOT; // Keep track of the size of the dictionary mSize++; - + for (int i = 0; i < slen; i++) { char c = src.charAt(i); boolean found = false; diff --git a/core/java/android/text/BidiFormatter.java b/core/java/android/text/BidiFormatter.java index 59273f428240..d84502f69035 100644 --- a/core/java/android/text/BidiFormatter.java +++ b/core/java/android/text/BidiFormatter.java @@ -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; /** diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index 409994d7cd84..de8aa5af5ccc 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -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; diff --git a/core/java/android/text/InputType.java b/core/java/android/text/InputType.java index c5963882e2bf..8967b709a04f 100644 --- a/core/java/android/text/InputType.java +++ b/core/java/android/text/InputType.java @@ -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 @@ -51,19 +49,19 @@ public interface InputType { * or flags.<p> */ public static final int TYPE_MASK_CLASS = 0x0000000f; - + /** * Mask of bits that determine the variation of * the base content class. */ public static final int TYPE_MASK_VARIATION = 0x00000ff0; - + /** * Mask of bits that provide addition bit flags * of options. */ public static final int TYPE_MASK_FLAGS = 0x00fff000; - + /** * Special content type for when no explicit type has been specified. * This should be interpreted to mean that the target input connection @@ -75,11 +73,11 @@ public interface InputType { * flag is set. */ public static final int TYPE_NULL = 0x00000000; - + // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- - + /** * Class for normal text. This class supports the following flags (only * one of which should be set): @@ -92,7 +90,7 @@ public interface InputType { * variation, normal should be assumed. */ public static final int TYPE_CLASS_TEXT = 0x00000001; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters. Overrides * {@link #TYPE_TEXT_FLAG_CAP_WORDS} and @@ -101,7 +99,7 @@ public interface InputType { * this only affects languages where there are upper-case and lower-case letters. */ public static final int TYPE_TEXT_FLAG_CAP_CHARACTERS = 0x00001000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of * every word. Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}. This @@ -110,7 +108,7 @@ public interface InputType { * this only affects languages where there are upper-case and lower-case letters. */ public static final int TYPE_TEXT_FLAG_CAP_WORDS = 0x00002000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of * each sentence. This value is explicitly defined @@ -121,7 +119,7 @@ public interface InputType { * this only affects languages where there are upper-case and lower-case letters. */ public static final int TYPE_TEXT_FLAG_CAP_SENTENCES = 0x00004000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form * text that should have auto-correction applied to it. Without this flag, @@ -135,7 +133,7 @@ public interface InputType { * the IME offers an interface to show suggestions. */ public static final int TYPE_TEXT_FLAG_AUTO_CORRECT = 0x00008000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means * the application) is performing auto-completion of the text being entered @@ -154,23 +152,23 @@ public interface InputType { * it will rely on the Editor to pass completions/corrections. */ public static final int TYPE_TEXT_FLAG_AUTO_COMPLETE = 0x00010000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be - * entered into the field. If this flag is not set, the text field + * entered into the field. If this flag is not set, the text field * will be constrained to a single line. The IME may also choose not to * display an enter key when this flag is not set, as there should be no * need to create new lines. */ public static final int TYPE_TEXT_FLAG_MULTI_LINE = 0x00020000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated * with this should not be multi-line, but when a fullscreen input method * is providing text it should use multiple lines if it can. */ public static final int TYPE_TEXT_FLAG_IME_MULTI_LINE = 0x00040000; - + /** * Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to * display any dictionary-based candidates. This is useful for text views that @@ -191,36 +189,36 @@ public interface InputType { public static final int TYPE_TEXT_FLAG_NO_SUGGESTIONS = 0x00080000; // ---------------------------------------------------------------------- - + /** * Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text. */ public static final int TYPE_TEXT_VARIATION_NORMAL = 0x00000000; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering a URI. */ public static final int TYPE_TEXT_VARIATION_URI = 0x00000010; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address. */ public static final int TYPE_TEXT_VARIATION_EMAIL_ADDRESS = 0x00000020; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of * an e-mail. */ public static final int TYPE_TEXT_VARIATION_EMAIL_SUBJECT = 0x00000030; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal * message such as an instant message or a text message. */ public static final int TYPE_TEXT_VARIATION_SHORT_MESSAGE = 0x00000040; - + /** - * Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long, possibly + * Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long, possibly * formal message such as the body of an e-mail. */ public static final int TYPE_TEXT_VARIATION_LONG_MESSAGE = 0x00000050; @@ -229,34 +227,34 @@ public interface InputType { * Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person. */ public static final int TYPE_TEXT_VARIATION_PERSON_NAME = 0x00000060; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address. */ public static final int TYPE_TEXT_VARIATION_POSTAL_ADDRESS = 0x00000070; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering a password. */ public static final int TYPE_TEXT_VARIATION_PASSWORD = 0x00000080; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should * be visible to the user. */ public static final int TYPE_TEXT_VARIATION_VISIBLE_PASSWORD = 0x00000090; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form. */ public static final int TYPE_TEXT_VARIATION_WEB_EDIT_TEXT = 0x000000a0; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents * of a list etc. */ public static final int TYPE_TEXT_VARIATION_FILTER = 0x000000b0; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic * pronunciation, such as a phonetic name field in contacts. This is mostly @@ -264,7 +262,7 @@ public interface InputType { * readings, like Japanese. */ public static final int TYPE_TEXT_VARIATION_PHONETIC = 0x000000c0; - + /** * Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside * of a web form. This was added in @@ -290,7 +288,7 @@ public interface InputType { // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- - + /** * Class for numeric text. This class supports the following flags: * {@link #TYPE_NUMBER_FLAG_SIGNED} and @@ -301,19 +299,19 @@ public interface InputType { * the variation, normal should be assumed.</p> */ public static final int TYPE_CLASS_NUMBER = 0x00000002; - + /** * Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing * a positive or negative sign at the start. */ public static final int TYPE_NUMBER_FLAG_SIGNED = 0x00001000; - + /** * Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing * a decimal point to provide fractional values. */ public static final int TYPE_NUMBER_FLAG_DECIMAL = 0x00002000; - + // ---------------------------------------------------------------------- /** @@ -340,17 +338,17 @@ public interface InputType { // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- - + /** * Class for a phone number. This class currently supports no variations * or flags. */ public static final int TYPE_CLASS_PHONE = 0x00000003; - + // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- - + /** * Class for dates and times. It supports the * following variations: @@ -359,19 +357,19 @@ public interface InputType { * {@link #TYPE_DATETIME_VARIATION_TIME}. */ public static final int TYPE_CLASS_DATETIME = 0x00000004; - + /** * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering * both a date and time. */ public static final int TYPE_DATETIME_VARIATION_NORMAL = 0x00000000; - + /** * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering * only a date. */ public static final int TYPE_DATETIME_VARIATION_DATE = 0x00000010; - + /** * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering * only a time. diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 2a52961984f7..03a2d6233967 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -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; diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 23b22d1dcf96..6262fc2a4846 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -60,8 +60,6 @@ import android.view.View; import com.android.internal.R; import com.android.internal.util.ArrayUtils; -import libcore.icu.ICU; - import java.lang.reflect.Array; import java.util.Iterator; import java.util.List; diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 3ed37b362336..b5a8acaf674f 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -23,15 +23,15 @@ import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.SpannedString; +import libcore.icu.ICU; +import libcore.icu.LocaleData; + +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import java.text.SimpleDateFormat; - -import libcore.icu.ICU; -import libcore.icu.LocaleData; /** * Utility class for producing strings with formatted date/time. diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index cb8852cf471a..f16e714d82d1 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -16,12 +16,16 @@ package android.text.format; -import com.android.internal.R; - import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import com.android.internal.R; + +import libcore.icu.DateIntervalFormat; +import libcore.icu.LocaleData; +import libcore.icu.RelativeDateTimeFormatter; + import java.io.IOException; import java.util.Calendar; import java.util.Date; @@ -30,10 +34,6 @@ import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import libcore.icu.DateIntervalFormat; -import libcore.icu.LocaleData; -import libcore.icu.RelativeDateTimeFormatter; - /** * This class contains various date-related utilities for creating text for things like * elapsed time and date ranges, strings for days of the week and months, and AM/PM text etc. diff --git a/core/java/android/text/format/Formatter.java b/core/java/android/text/format/Formatter.java index be5246418d84..b67ac9840d60 100644 --- a/core/java/android/text/format/Formatter.java +++ b/core/java/android/text/format/Formatter.java @@ -20,11 +20,10 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.content.res.Resources; +import android.net.NetworkUtils; import android.text.BidiFormatter; import android.text.TextUtils; import android.view.View; -import android.net.NetworkUtils; -import android.net.TrafficStats; import java.util.Locale; diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java index 69c2cff80cac..bbd9c9c0bac0 100644 --- a/core/java/android/text/format/Time.java +++ b/core/java/android/text/format/Time.java @@ -18,13 +18,13 @@ package android.text.format; import android.util.TimeFormatException; +import libcore.util.ZoneInfo; +import libcore.util.ZoneInfoDB; + import java.io.IOException; import java.util.Locale; import java.util.TimeZone; -import libcore.util.ZoneInfo; -import libcore.util.ZoneInfoDB; - /** * An alternative to the {@link java.util.Calendar} and * {@link java.util.GregorianCalendar} classes. An instance of the Time class represents diff --git a/core/java/android/text/format/TimeFormatter.java b/core/java/android/text/format/TimeFormatter.java index 3a63805defe0..5a14092c95a8 100644 --- a/core/java/android/text/format/TimeFormatter.java +++ b/core/java/android/text/format/TimeFormatter.java @@ -22,12 +22,13 @@ package android.text.format; import android.content.res.Resources; +import libcore.icu.LocaleData; +import libcore.util.ZoneInfo; + import java.nio.CharBuffer; import java.util.Formatter; import java.util.Locale; import java.util.TimeZone; -import libcore.icu.LocaleData; -import libcore.util.ZoneInfo; /** * Formatting logic for {@link Time}. Contains a port of Bionic's broken strftime_tz to Java. diff --git a/core/java/android/text/method/BaseKeyListener.java b/core/java/android/text/method/BaseKeyListener.java index 14e0b4f8fcb8..90559dcdbcf4 100644 --- a/core/java/android/text/method/BaseKeyListener.java +++ b/core/java/android/text/method/BaseKeyListener.java @@ -19,19 +19,22 @@ package android.text.method; import android.graphics.Paint; import android.icu.lang.UCharacter; import android.icu.lang.UProperty; -import android.view.KeyEvent; -import android.view.View; -import android.text.*; +import android.text.Editable; +import android.text.Emoji; +import android.text.InputType; +import android.text.Layout; +import android.text.NoCopySpan; +import android.text.Selection; +import android.text.Spanned; import android.text.method.TextKeyListener.Capitalize; import android.text.style.ReplacementSpan; +import android.view.KeyEvent; +import android.view.View; import android.widget.TextView; import com.android.internal.annotations.GuardedBy; import java.text.BreakIterator; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; /** * Abstract base class for key listeners. diff --git a/core/java/android/text/method/CharacterPickerDialog.java b/core/java/android/text/method/CharacterPickerDialog.java index 880e46daf1aa..7d838e06cd68 100644 --- a/core/java/android/text/method/CharacterPickerDialog.java +++ b/core/java/android/text/method/CharacterPickerDialog.java @@ -16,24 +16,25 @@ package android.text.method; -import com.android.internal.R; - import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.text.*; +import android.text.Editable; +import android.text.Selection; import android.view.LayoutInflater; -import android.view.View.OnClickListener; import android.view.View; +import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.GridView; +import com.android.internal.R; + /** * Dialog for choosing accented characters related to a base character. */ diff --git a/core/java/android/text/method/DateKeyListener.java b/core/java/android/text/method/DateKeyListener.java index e6f63d1ec4ee..88ef388bc420 100644 --- a/core/java/android/text/method/DateKeyListener.java +++ b/core/java/android/text/method/DateKeyListener.java @@ -16,8 +16,8 @@ package android.text.method; -import android.view.KeyEvent; import android.text.InputType; +import android.view.KeyEvent; /** * For entering dates in a text field. @@ -32,7 +32,7 @@ public class DateKeyListener extends NumberKeyListener return InputType.TYPE_CLASS_DATETIME | InputType.TYPE_DATETIME_VARIATION_DATE; } - + @Override protected char[] getAcceptedChars() { diff --git a/core/java/android/text/method/DialerKeyListener.java b/core/java/android/text/method/DialerKeyListener.java index bb8b0de8a9f3..17abed6c363a 100644 --- a/core/java/android/text/method/DialerKeyListener.java +++ b/core/java/android/text/method/DialerKeyListener.java @@ -16,10 +16,10 @@ package android.text.method; -import android.view.KeyEvent; -import android.view.KeyCharacterMap.KeyData; import android.text.InputType; import android.text.Spannable; +import android.view.KeyCharacterMap.KeyData; +import android.view.KeyEvent; /** * For dialing-only text entry @@ -47,7 +47,7 @@ public class DialerKeyListener extends NumberKeyListener public int getInputType() { return InputType.TYPE_CLASS_PHONE; } - + /** * Overrides the superclass's lookup method to prefer the number field * from the KeyEvent. diff --git a/core/java/android/text/method/DigitsKeyListener.java b/core/java/android/text/method/DigitsKeyListener.java index c95df46810b1..4aeb39a4876d 100644 --- a/core/java/android/text/method/DigitsKeyListener.java +++ b/core/java/android/text/method/DigitsKeyListener.java @@ -17,8 +17,8 @@ package android.text.method; import android.text.InputType; -import android.text.Spanned; import android.text.SpannableStringBuilder; +import android.text.Spanned; import android.view.KeyEvent; @@ -133,7 +133,7 @@ public class DigitsKeyListener extends NumberKeyListener } return contentType; } - + @Override public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { diff --git a/core/java/android/text/method/MetaKeyKeyListener.java b/core/java/android/text/method/MetaKeyKeyListener.java index e9db5fde77ed..c3c7302ce090 100644 --- a/core/java/android/text/method/MetaKeyKeyListener.java +++ b/core/java/android/text/method/MetaKeyKeyListener.java @@ -20,9 +20,9 @@ import android.text.Editable; import android.text.NoCopySpan; import android.text.Spannable; import android.text.Spanned; +import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.View; -import android.view.KeyCharacterMap; /** * This base class encapsulates the behavior for tracking the state of @@ -86,7 +86,7 @@ public abstract class MetaKeyKeyListener { * Value equals {@link KeyEvent#META_SYM_ON}. */ public static final int META_SYM_ON = KeyEvent.META_SYM_ON; - + /** * Flag that indicates that the SHIFT key is locked in CAPS mode. */ @@ -111,11 +111,11 @@ public abstract class MetaKeyKeyListener { private static final long META_CAP_USED = 1L << 32; private static final long META_ALT_USED = 1L << 33; private static final long META_SYM_USED = 1L << 34; - + private static final long META_CAP_PRESSED = 1L << 40; private static final long META_ALT_PRESSED = 1L << 41; private static final long META_SYM_PRESSED = 1L << 42; - + private static final long META_CAP_RELEASED = 1L << 48; private static final long META_ALT_RELEASED = 1L << 49; private static final long META_SYM_RELEASED = 1L << 50; @@ -129,7 +129,7 @@ public abstract class MetaKeyKeyListener { private static final long META_SYM_MASK = META_SYM_ON | META_SYM_LOCKED | META_SYM_USED | META_SYM_PRESSED | META_SYM_RELEASED; - + private static final Object CAP = new NoCopySpan.Concrete(); private static final Object ALT = new NoCopySpan.Concrete(); private static final Object SYM = new NoCopySpan.Concrete(); @@ -150,7 +150,7 @@ public abstract class MetaKeyKeyListener { /** * Gets the state of the meta keys. - * + * * @param text the buffer in which the meta key would have been pressed. * * @return an integer in which each bit set to one represents a pressed @@ -448,7 +448,7 @@ public abstract class MetaKeyKeyListener { /** * Gets the state of the meta keys. - * + * * @param state the current meta state bits. * * @return an integer in which each bit set to one represents a pressed @@ -635,26 +635,26 @@ public abstract class MetaKeyKeyListener { /** * The meta key has been pressed but has not yet been used. */ - private static final int PRESSED = + private static final int PRESSED = Spannable.SPAN_MARK_MARK | (1 << Spannable.SPAN_USER_SHIFT); /** * The meta key has been pressed and released but has still * not yet been used. */ - private static final int RELEASED = + private static final int RELEASED = Spannable.SPAN_MARK_MARK | (2 << Spannable.SPAN_USER_SHIFT); /** * The meta key has been pressed and used but has not yet been released. */ - private static final int USED = + private static final int USED = Spannable.SPAN_MARK_MARK | (3 << Spannable.SPAN_USER_SHIFT); /** * The meta key has been pressed and released without use, and then * pressed again; it may also have been released again. */ - private static final int LOCKED = + private static final int LOCKED = Spannable.SPAN_MARK_MARK | (4 << Spannable.SPAN_USER_SHIFT); } diff --git a/core/java/android/text/method/MovementMethod.java b/core/java/android/text/method/MovementMethod.java index 01979fdb5cd4..f6fe575a9265 100644 --- a/core/java/android/text/method/MovementMethod.java +++ b/core/java/android/text/method/MovementMethod.java @@ -16,10 +16,10 @@ package android.text.method; -import android.widget.TextView; +import android.text.Spannable; import android.view.KeyEvent; import android.view.MotionEvent; -import android.text.*; +import android.widget.TextView; /** * Provides cursor positioning, scrolling and text selection functionality in a {@link TextView}. diff --git a/core/java/android/text/method/MultiTapKeyListener.java b/core/java/android/text/method/MultiTapKeyListener.java index 95ac0a154e5c..5770482b3feb 100644 --- a/core/java/android/text/method/MultiTapKeyListener.java +++ b/core/java/android/text/method/MultiTapKeyListener.java @@ -16,13 +16,16 @@ package android.text.method; -import android.view.KeyEvent; -import android.view.View; import android.os.Handler; import android.os.SystemClock; -import android.text.*; +import android.text.Editable; +import android.text.Selection; +import android.text.SpanWatcher; +import android.text.Spannable; import android.text.method.TextKeyListener.Capitalize; import android.util.SparseArray; +import android.view.KeyEvent; +import android.view.View; /** * This is the standard key listener for alphabetic input on 12-key @@ -81,7 +84,7 @@ public class MultiTapKeyListener extends BaseKeyListener public int getInputType() { return makeTextContentType(mCapitalize, mAutoText); } - + public boolean onKeyDown(View view, Editable content, int keyCode, KeyEvent event) { int selStart, selEnd; @@ -198,7 +201,7 @@ public class MultiTapKeyListener extends BaseKeyListener if (selEnd != oldStart) { Selection.setSelection(content, oldStart, selEnd); - content.setSpan(TextKeyListener.LAST_TYPED, + content.setSpan(TextKeyListener.LAST_TYPED, oldStart, selEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); diff --git a/core/java/android/text/method/NumberKeyListener.java b/core/java/android/text/method/NumberKeyListener.java index 988d566f5a7e..6b12b7e83c66 100644 --- a/core/java/android/text/method/NumberKeyListener.java +++ b/core/java/android/text/method/NumberKeyListener.java @@ -16,14 +16,14 @@ package android.text.method; -import android.view.KeyEvent; -import android.view.View; import android.text.Editable; import android.text.InputFilter; import android.text.Selection; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; +import android.view.KeyEvent; +import android.view.View; /** * For numeric text entry @@ -91,7 +91,7 @@ public abstract class NumberKeyListener extends BaseKeyListener return false; } - + @Override public boolean onKeyDown(View view, Editable content, int keyCode, KeyEvent event) { diff --git a/core/java/android/text/method/PasswordTransformationMethod.java b/core/java/android/text/method/PasswordTransformationMethod.java index 88a69b93f959..4485e3856619 100644 --- a/core/java/android/text/method/PasswordTransformationMethod.java +++ b/core/java/android/text/method/PasswordTransformationMethod.java @@ -16,18 +16,18 @@ package android.text.method; +import android.graphics.Rect; import android.os.Handler; import android.os.SystemClock; -import android.graphics.Rect; -import android.view.View; import android.text.Editable; import android.text.GetChars; import android.text.NoCopySpan; +import android.text.Spannable; +import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; -import android.text.Spanned; -import android.text.Spannable; import android.text.style.UpdateLayout; +import android.view.View; import java.lang.ref.WeakReference; diff --git a/core/java/android/text/method/QwertyKeyListener.java b/core/java/android/text/method/QwertyKeyListener.java index b17f5021f59f..bea68b12062d 100644 --- a/core/java/android/text/method/QwertyKeyListener.java +++ b/core/java/android/text/method/QwertyKeyListener.java @@ -16,7 +16,12 @@ package android.text.method; -import android.text.*; +import android.text.AutoText; +import android.text.Editable; +import android.text.NoCopySpan; +import android.text.Selection; +import android.text.Spannable; +import android.text.TextUtils; import android.text.method.TextKeyListener.Capitalize; import android.util.SparseArray; import android.view.KeyCharacterMap; @@ -80,7 +85,7 @@ public class QwertyKeyListener extends BaseKeyListener { public int getInputType() { return makeTextContentType(mAutoCap, mAutoText); } - + public boolean onKeyDown(View view, Editable content, int keyCode, KeyEvent event) { int selStart, selEnd; @@ -191,9 +196,9 @@ public class QwertyKeyListener extends BaseKeyListener { } } - if ((pref & TextKeyListener.AUTO_CAP) != 0 && - Character.isLowerCase(i) && - TextKeyListener.shouldCap(mAutoCap, content, selStart)) { + if ((pref & TextKeyListener.AUTO_CAP) != 0 + && Character.isLowerCase(i) + && TextKeyListener.shouldCap(mAutoCap, content, selStart)) { int where = content.getSpanEnd(TextKeyListener.CAPPED); int flags = content.getSpanFlags(TextKeyListener.CAPPED); @@ -361,9 +366,9 @@ public class QwertyKeyListener extends BaseKeyListener { View view) { int len = end - start; boolean changecase = false; - + String replacement = AutoText.get(src, start, end, view); - + if (replacement == null) { String key = TextUtils.substring(src, start, end).toLowerCase(); replacement = AutoText.get(key, 0, end - start, view); @@ -372,7 +377,7 @@ public class QwertyKeyListener extends BaseKeyListener { if (replacement == null) return null; } - + int caps = 0; if (changecase) { diff --git a/core/java/android/text/method/ScrollingMovementMethod.java b/core/java/android/text/method/ScrollingMovementMethod.java index b9f5d5f447e3..4f422cbf51cb 100644 --- a/core/java/android/text/method/ScrollingMovementMethod.java +++ b/core/java/android/text/method/ScrollingMovementMethod.java @@ -16,10 +16,11 @@ package android.text.method; +import android.text.Layout; +import android.text.Spannable; import android.view.MotionEvent; -import android.text.*; -import android.widget.TextView; import android.view.View; +import android.widget.TextView; /** * A movement method that interprets movement keys by scrolling the text buffer. diff --git a/core/java/android/text/method/TextKeyListener.java b/core/java/android/text/method/TextKeyListener.java index 994f3d75cf43..9cbda9c07591 100644 --- a/core/java/android/text/method/TextKeyListener.java +++ b/core/java/android/text/method/TextKeyListener.java @@ -22,11 +22,16 @@ import android.database.ContentObserver; import android.os.Handler; import android.provider.Settings; import android.provider.Settings.System; -import android.text.*; +import android.text.Editable; +import android.text.InputType; +import android.text.NoCopySpan; +import android.text.Selection; +import android.text.SpanWatcher; +import android.text.Spannable; +import android.text.TextUtils; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.View; -import android.text.InputType; import java.lang.ref.WeakReference; @@ -127,7 +132,7 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher { public int getInputType() { return makeTextContentType(mAutoCap, mAutoText); } - + @Override public boolean onKeyDown(View view, Editable content, int keyCode, KeyEvent event) { @@ -213,7 +218,7 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher { public int getInputType() { return InputType.TYPE_NULL; } - + public boolean onKeyDown(View view, Editable content, int keyCode, KeyEvent event) { return false; @@ -230,7 +235,7 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher { public void clearMetaKeyState(View view, Editable content, int states) { } - + public static NullKeyListener getInstance() { if (sInstance != null) return sInstance; diff --git a/core/java/android/text/method/TimeKeyListener.java b/core/java/android/text/method/TimeKeyListener.java index c5bfd5cf95d7..01f40862ffb4 100644 --- a/core/java/android/text/method/TimeKeyListener.java +++ b/core/java/android/text/method/TimeKeyListener.java @@ -16,8 +16,8 @@ package android.text.method; -import android.view.KeyEvent; import android.text.InputType; +import android.view.KeyEvent; /** * For entering times in a text field. @@ -32,7 +32,7 @@ public class TimeKeyListener extends NumberKeyListener return InputType.TYPE_CLASS_DATETIME | InputType.TYPE_DATETIME_VARIATION_TIME; } - + @Override protected char[] getAcceptedChars() { diff --git a/core/java/android/text/method/WordIterator.java b/core/java/android/text/method/WordIterator.java index 89ed08cbcd59..17938a8cf7f3 100644 --- a/core/java/android/text/method/WordIterator.java +++ b/core/java/android/text/method/WordIterator.java @@ -18,8 +18,8 @@ package android.text.method; import android.annotation.NonNull; import android.icu.text.BreakIterator; -import android.text.Selection; import android.text.CharSequenceCharacterIterator; +import android.text.Selection; import java.util.Locale; diff --git a/core/java/android/text/style/DrawableMarginSpan.java b/core/java/android/text/style/DrawableMarginSpan.java index 20b6886facf0..35241796c3c3 100644 --- a/core/java/android/text/style/DrawableMarginSpan.java +++ b/core/java/android/text/style/DrawableMarginSpan.java @@ -16,11 +16,11 @@ package android.text.style; -import android.graphics.drawable.Drawable; -import android.graphics.Paint; import android.graphics.Canvas; -import android.text.Spanned; +import android.graphics.Paint; +import android.graphics.drawable.Drawable; import android.text.Layout; +import android.text.Spanned; public class DrawableMarginSpan implements LeadingMarginSpan, LineHeightSpan diff --git a/core/java/android/text/style/IconMarginSpan.java b/core/java/android/text/style/IconMarginSpan.java index cf9a70595715..304c83f19f02 100644 --- a/core/java/android/text/style/IconMarginSpan.java +++ b/core/java/android/text/style/IconMarginSpan.java @@ -16,11 +16,11 @@ package android.text.style; -import android.graphics.Paint; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.text.Spanned; +import android.graphics.Paint; import android.text.Layout; +import android.text.Spanned; public class IconMarginSpan implements LeadingMarginSpan, LineHeightSpan diff --git a/core/java/android/text/style/LeadingMarginSpan.java b/core/java/android/text/style/LeadingMarginSpan.java index 339d88524541..5bd2d60bb34f 100644 --- a/core/java/android/text/style/LeadingMarginSpan.java +++ b/core/java/android/text/style/LeadingMarginSpan.java @@ -16,8 +16,8 @@ package android.text.style; -import android.graphics.Paint; import android.graphics.Canvas; +import android.graphics.Paint; import android.os.Parcel; import android.text.Layout; import android.text.ParcelableSpan; @@ -39,7 +39,7 @@ extends ParagraphStyle * Returns the amount by which to adjust the leading margin. Positive values * move away from the leading edge of the paragraph, negative values move * towards it. - * + * * @param first true if the request is for the first line of a paragraph, * false for subsequent lines * @return the offset for the margin. @@ -49,7 +49,7 @@ extends ParagraphStyle /** * Renders the leading margin. This is called before the margin has been * adjusted by the value returned by {@link #getLeadingMargin(boolean)}. - * + * * @param c the canvas * @param p the paint. The this should be left unchanged on exit. * @param x the current position of the margin @@ -98,11 +98,11 @@ extends ParagraphStyle */ public static class Standard implements LeadingMarginSpan, ParcelableSpan { private final int mFirst, mRest; - + /** * Constructor taking separate indents for the first and subsequent * lines. - * + * * @param first the indent for the first line of the paragraph * @param rest the indent for the remaining lines of the paragraph */ @@ -123,7 +123,7 @@ extends ParagraphStyle mFirst = src.readInt(); mRest = src.readInt(); } - + public int getSpanTypeId() { return getSpanTypeIdInternal(); } @@ -132,7 +132,7 @@ extends ParagraphStyle public int getSpanTypeIdInternal() { return TextUtils.LEADING_MARGIN_SPAN; } - + public int describeContents() { return 0; } diff --git a/core/java/android/text/style/LineBackgroundSpan.java b/core/java/android/text/style/LineBackgroundSpan.java index 854aeafb9251..9c7859fb11e4 100644 --- a/core/java/android/text/style/LineBackgroundSpan.java +++ b/core/java/android/text/style/LineBackgroundSpan.java @@ -16,8 +16,8 @@ package android.text.style; -import android.graphics.Paint; import android.graphics.Canvas; +import android.graphics.Paint; public interface LineBackgroundSpan extends ParagraphStyle diff --git a/core/java/android/text/style/LocaleSpan.java b/core/java/android/text/style/LocaleSpan.java index b8428517748f..479ff0e902b2 100644 --- a/core/java/android/text/style/LocaleSpan.java +++ b/core/java/android/text/style/LocaleSpan.java @@ -16,8 +16,6 @@ package android.text.style; -import com.android.internal.util.Preconditions; - import android.annotation.NonNull; import android.annotation.Nullable; import android.graphics.Paint; @@ -27,6 +25,8 @@ import android.text.ParcelableSpan; import android.text.TextPaint; import android.text.TextUtils; +import com.android.internal.util.Preconditions; + import java.util.Locale; /** diff --git a/core/java/android/text/style/QuoteSpan.java b/core/java/android/text/style/QuoteSpan.java index 0b0a82cabc45..7217e1e5efa8 100644 --- a/core/java/android/text/style/QuoteSpan.java +++ b/core/java/android/text/style/QuoteSpan.java @@ -17,8 +17,8 @@ package android.text.style; import android.annotation.ColorInt; -import android.graphics.Paint; import android.graphics.Canvas; +import android.graphics.Paint; import android.os.Parcel; import android.text.Layout; import android.text.ParcelableSpan; @@ -34,7 +34,7 @@ public class QuoteSpan implements LeadingMarginSpan, ParcelableSpan { super(); mColor = 0xff0000ff; } - + public QuoteSpan(@ColorInt int color) { super(); mColor = color; @@ -43,7 +43,7 @@ public class QuoteSpan implements LeadingMarginSpan, ParcelableSpan { public QuoteSpan(Parcel src) { mColor = src.readInt(); } - + public int getSpanTypeId() { return getSpanTypeIdInternal(); } @@ -52,7 +52,7 @@ public class QuoteSpan implements LeadingMarginSpan, ParcelableSpan { public int getSpanTypeIdInternal() { return TextUtils.QUOTE_SPAN; } - + public int describeContents() { return 0; } @@ -70,7 +70,7 @@ public class QuoteSpan implements LeadingMarginSpan, ParcelableSpan { public int getColor() { return mColor; } - + public int getLeadingMargin(boolean first) { return STRIPE_WIDTH + GAP_WIDTH; } diff --git a/core/java/android/text/style/ReplacementSpan.java b/core/java/android/text/style/ReplacementSpan.java index 07190b2f1d6a..5f94ad054b63 100644 --- a/core/java/android/text/style/ReplacementSpan.java +++ b/core/java/android/text/style/ReplacementSpan.java @@ -19,8 +19,8 @@ package android.text.style; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; -import android.graphics.Paint; import android.graphics.Canvas; +import android.graphics.Paint; import android.text.TextPaint; public abstract class ReplacementSpan extends MetricAffectingSpan { diff --git a/core/java/android/text/style/TtsSpan.java b/core/java/android/text/style/TtsSpan.java index e9153ddba831..c5e5df091592 100644 --- a/core/java/android/text/style/TtsSpan.java +++ b/core/java/android/text/style/TtsSpan.java @@ -16,14 +16,14 @@ package android.text.style; -import java.text.NumberFormat; -import java.util.Locale; - import android.os.Parcel; import android.os.PersistableBundle; import android.text.ParcelableSpan; import android.text.TextUtils; +import java.text.NumberFormat; +import java.util.Locale; + /** * A span that supplies additional meta-data for the associated text intended * for text-to-speech engines. If the text is being processed by a diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index ca037a229b0a..7e6eb4906c20 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -20,16 +20,21 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.telephony.PhoneNumberUtils; -import android.text.method.LinkMovementMethod; -import android.text.method.MovementMethod; -import android.text.style.URLSpan; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; +import android.text.method.LinkMovementMethod; +import android.text.method.MovementMethod; +import android.text.style.URLSpan; import android.util.Patterns; import android.webkit.WebView; import android.widget.TextView; +import com.android.i18n.phonenumbers.PhoneNumberMatch; +import com.android.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency; + +import libcore.util.EmptyArray; import java.io.UnsupportedEncodingException; import java.lang.annotation.Retention; @@ -42,12 +47,6 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.android.i18n.phonenumbers.PhoneNumberMatch; -import com.android.i18n.phonenumbers.PhoneNumberUtil; -import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency; - -import libcore.util.EmptyArray; - /** * Linkify take a piece of text and a regular expression and turns all of the * regex matches in the text into clickable links. This is particularly |