commit e079172ff2a120c668930c6990a8dfabd0d9f13b
author Yorke Lee <yorkelee@google.com> Mon Dec 02 20:15:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 02 20:15:43 2013 +0000
tree d5e3da0a3cc8fff78895d2f12b5e9e3c2946f37f
parent 3d18e9ed473aa43bd30a446f730940e99f1c6b1e
parent 8bb6247f2cdc6733bbee195bca3b89ce301cdd27

Merge "Remove private references to android.R.styleable"

src/com/android/contacts/common/GeoUtil.java

diff --git a/src/com/android/contacts/common/GeoUtil.java b/src/com/android/contacts/common/GeoUtil.java
index 5ca04b0..4bf001a 100644
--- a/src/com/android/contacts/common/GeoUtil.java
+++ b/src/com/android/contacts/common/GeoUtil.java
@@ -20,10 +20,10 @@
 import android.location.Country;
 import android.location.CountryDetector;
 
-import com.android.i18n.phonenumbers.NumberParseException;
-import com.android.i18n.phonenumbers.PhoneNumberUtil;
-import com.android.i18n.phonenumbers.Phonenumber;
-import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
+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;
 
 import java.util.Locale;
 

src/com/android/contacts/common/list/ShortcutIntentBuilder.java

diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
index b332dce..2a40a08 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
@@ -341,7 +341,7 @@
         drawBorder(canvas, dst);
 
         Drawable overlay = mContext.getResources().getDrawableForDensity(
-                com.android.internal.R.drawable.quickcontact_badge_overlay_dark, mIconDensity);
+                R.drawable.quickcontact_badge_overlay_dark, mIconDensity);
 
         overlay.setBounds(dst);
         overlay.draw(canvas);