From e713576292fc72086de47066981b86ad2f27ab0f Mon Sep 17 00:00:00 2001 From: Shaopeng Jia Date: Fri, 12 Aug 2011 13:25:41 +0200 Subject: Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers to avoid name collision. Bug: 5157607 Change-Id: Ic397f371e381a71f17b0b70b955e89d08f7a9867 --- .../android/telephony/PhoneNumberFormattingTextWatcher.java | 4 ++-- telephony/java/android/telephony/PhoneNumberUtils.java | 8 ++++---- telephony/java/com/android/internal/telephony/CallerInfo.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java index ffabb7b..6f85c7d 100644 --- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java +++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java @@ -16,8 +16,8 @@ package android.telephony; -import com.google.i18n.phonenumbers.AsYouTypeFormatter; -import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.AsYouTypeFormatter; +import com.android.i18n.phonenumbers.PhoneNumberUtil; import android.telephony.PhoneNumberUtils; import android.text.Editable; diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index ad2a887..c1713a5 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -16,10 +16,10 @@ package android.telephony; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.android.i18n.phonenumbers.NumberParseException; +import com.android.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; +import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import android.content.Context; import android.content.Intent; diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java index 68e0045..25f8c8b 100644 --- a/telephony/java/com/android/internal/telephony/CallerInfo.java +++ b/telephony/java/com/android/internal/telephony/CallerInfo.java @@ -30,10 +30,10 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; +import com.android.i18n.phonenumbers.NumberParseException; +import com.android.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.util.Locale; @@ -502,7 +502,7 @@ public class CallerInfo { /** * @return a geographical description string for the specified number. - * @see com.google.i18n.phonenumbers.PhoneNumberOfflineGeocoder + * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder */ private static String getGeoDescription(Context context, String number) { if (VDBG) Log.v(TAG, "getGeoDescription('" + number + "')..."); -- cgit v1.1