From 115c04410ec276f9fe7e364f9ac082cad5bce8d0 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Tue, 2 Jun 2015 13:27:47 -0700 Subject: [PATCH] Rename PhoneNumberUtils APIs In response to more API review. Bug: 21571895 Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a --- api/current.txt | 6 +++--- api/system-current.txt | 6 +++--- .../android/telephony/PhoneNumberUtils.java | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api/current.txt b/api/current.txt index f31593dd79194..1927ee173dc9a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30839,12 +30839,14 @@ package android.telephony { public class PhoneNumberUtils { ctor public PhoneNumberUtils(); - method public static void addPhoneTtsSpan(android.text.Spannable, int, int); + method public static void addTtsSpan(android.text.Spannable, int, int); method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int); method public static java.lang.String calledPartyBCDToString(byte[], int, int); method public static boolean compare(java.lang.String, java.lang.String); method public static boolean compare(android.content.Context, java.lang.String, java.lang.String); method public static java.lang.String convertKeypadLettersToDigits(java.lang.String); + method public static android.text.style.TtsSpan createTtsSpan(java.lang.String); + method public static java.lang.CharSequence createTtsSpannable(java.lang.CharSequence); method public static java.lang.String extractNetworkPortion(java.lang.String); method public static java.lang.String extractPostDialPortion(java.lang.String); method public static deprecated void formatJapaneseNumber(android.text.Editable); @@ -30857,8 +30859,6 @@ package android.telephony { method public static java.lang.String formatNumberToRFC3966(java.lang.String, java.lang.String); method public static deprecated int getFormatTypeForLocale(java.util.Locale); method public static java.lang.String getNumberFromIntent(android.content.Intent, android.content.Context); - method public static android.text.style.TtsSpan getPhoneTtsSpan(java.lang.String); - method public static java.lang.CharSequence getPhoneTtsSpannable(java.lang.CharSequence); method public static java.lang.String getStrippedReversed(java.lang.String); method public static final boolean is12Key(char); method public static final boolean isDialable(char); diff --git a/api/system-current.txt b/api/system-current.txt index cf6d0f6fe5495..82bcd22957975 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33054,12 +33054,14 @@ package android.telephony { public class PhoneNumberUtils { ctor public PhoneNumberUtils(); - method public static void addPhoneTtsSpan(android.text.Spannable, int, int); + method public static void addTtsSpan(android.text.Spannable, int, int); method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int); method public static java.lang.String calledPartyBCDToString(byte[], int, int); method public static boolean compare(java.lang.String, java.lang.String); method public static boolean compare(android.content.Context, java.lang.String, java.lang.String); method public static java.lang.String convertKeypadLettersToDigits(java.lang.String); + method public static android.text.style.TtsSpan createTtsSpan(java.lang.String); + method public static java.lang.CharSequence createTtsSpannable(java.lang.CharSequence); method public static java.lang.String extractNetworkPortion(java.lang.String); method public static java.lang.String extractPostDialPortion(java.lang.String); method public static deprecated void formatJapaneseNumber(android.text.Editable); @@ -33072,8 +33074,6 @@ package android.telephony { method public static java.lang.String formatNumberToRFC3966(java.lang.String, java.lang.String); method public static deprecated int getFormatTypeForLocale(java.util.Locale); method public static java.lang.String getNumberFromIntent(android.content.Intent, android.content.Context); - method public static android.text.style.TtsSpan getPhoneTtsSpan(java.lang.String); - method public static java.lang.CharSequence getPhoneTtsSpannable(java.lang.CharSequence); method public static java.lang.String getStrippedReversed(java.lang.String); method public static final boolean is12Key(char); method public static final boolean isDialable(char); diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index a41875f705e7a..3fcd7d9257a7a 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -2336,12 +2336,12 @@ public class PhoneNumberUtils * @param phoneNumber A {@code CharSequence} the entirety of which represents a phone number. * @return A {@code CharSequence} with appropriate annotations. */ - public static CharSequence getPhoneTtsSpannable(CharSequence phoneNumber) { + public static CharSequence createTtsSpannable(CharSequence phoneNumber) { if (phoneNumber == null) { return null; } Spannable spannable = Spannable.Factory.getInstance().newSpannable(phoneNumber); - PhoneNumberUtils.addPhoneTtsSpan(spannable, 0, spannable.length()); + PhoneNumberUtils.addTtsSpan(spannable, 0, spannable.length()); return spannable; } @@ -2353,8 +2353,8 @@ public class PhoneNumberUtils * @param start The starting character position of the phone number in {@code s}. * @param endExclusive The position after the ending character in the phone number {@code s}. */ - public static void addPhoneTtsSpan(Spannable s, int start, int endExclusive) { - s.setSpan(getPhoneTtsSpan(s.subSequence(start, endExclusive).toString()), + public static void addTtsSpan(Spannable s, int start, int endExclusive) { + s.setSpan(createTtsSpan(s.subSequence(start, endExclusive).toString()), start, endExclusive, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -2366,13 +2366,13 @@ public class PhoneNumberUtils * * @param phoneNumber A {@code CharSequence} the entirety of which represents a phone number. * @return A {@code CharSequence} with appropriate annotations. - * @deprecated Renamed {@link #getPhoneTtsSpannable}. + * @deprecated Renamed {@link #createTtsSpannable}. * * @hide */ @Deprecated public static CharSequence ttsSpanAsPhoneNumber(CharSequence phoneNumber) { - return getPhoneTtsSpannable(phoneNumber); + return createTtsSpannable(phoneNumber); } /** @@ -2383,13 +2383,13 @@ public class PhoneNumberUtils * @param start The starting character position of the phone number in {@code s}. * @param end The ending character position of the phone number in {@code s}. * - * @deprecated Renamed {@link #addPhoneTtsSpan}. + * @deprecated Renamed {@link #addTtsSpan}. * * @hide */ @Deprecated public static void ttsSpanAsPhoneNumber(Spannable s, int start, int end) { - addPhoneTtsSpan(s, start, end); + addTtsSpan(s, start, end); } /** @@ -2398,7 +2398,7 @@ public class PhoneNumberUtils * @param phoneNumberString A {@code String} the entirety of which represents a phone number. * @return A {@code TtsSpan} for {@param phoneNumberString}. */ - public static TtsSpan getPhoneTtsSpan(String phoneNumberString) { + public static TtsSpan createTtsSpan(String phoneNumberString) { if (phoneNumberString == null) { return null; }