am 55656c04: Merge "Asset swap for InCallUI" into lmp-dev

* commit '55656c04b23e260cb99d84b9469739b934513a89':
  Asset swap for InCallUI

17 files changed, 2 insertions, 2 deletions

diff --git a/InCallUI/res/drawable-hdpi/business_unknown.png b/InCallUI/res/drawable-hdpi/business_unknown.png
deleted file mode 100644
index b369939ec..000000000
--- a/InCallUI/res/drawable-hdpi/business_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/img_business.png b/InCallUI/res/drawable-hdpi/img_business.png
new file mode 100644
index 000000000..f70634262
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/img_business.png
diff --git a/InCallUI/res/drawable-hdpi/img_emergency.png b/InCallUI/res/drawable-hdpi/img_emergency.png
new file mode 100644
index 000000000..7e5eff48d
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/img_emergency.png
diff --git a/InCallUI/res/drawable-hdpi/picture_emergency.png b/InCallUI/res/drawable-hdpi/picture_emergency.png
deleted file mode 100644
index 0e13a4385..000000000
--- a/InCallUI/res/drawable-hdpi/picture_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/business_unknown.png b/InCallUI/res/drawable-mdpi/business_unknown.png
deleted file mode 100644
index eac97a9b7..000000000
--- a/InCallUI/res/drawable-mdpi/business_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/img_business.png b/InCallUI/res/drawable-mdpi/img_business.png
new file mode 100644
index 000000000..90738a7ee
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/img_business.png
diff --git a/InCallUI/res/drawable-mdpi/img_emergency.png b/InCallUI/res/drawable-mdpi/img_emergency.png
new file mode 100644
index 000000000..0209eb9d1
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/img_emergency.png
diff --git a/InCallUI/res/drawable-mdpi/picture_emergency.png b/InCallUI/res/drawable-mdpi/picture_emergency.png
deleted file mode 100644
index a224b8000..000000000
--- a/InCallUI/res/drawable-mdpi/picture_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/business_unknown.png b/InCallUI/res/drawable-xhdpi/business_unknown.png
deleted file mode 100644
index aa84456e4..000000000
--- a/InCallUI/res/drawable-xhdpi/business_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/img_business.png b/InCallUI/res/drawable-xhdpi/img_business.png
new file mode 100644
index 000000000..7b04d956f
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/img_business.png
diff --git a/InCallUI/res/drawable-xhdpi/img_emergency.png b/InCallUI/res/drawable-xhdpi/img_emergency.png
new file mode 100644
index 000000000..5c00d9d55
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/img_emergency.png
diff --git a/InCallUI/res/drawable-xhdpi/picture_emergency.png b/InCallUI/res/drawable-xhdpi/picture_emergency.png
deleted file mode 100644
index 08b421eef..000000000
--- a/InCallUI/res/drawable-xhdpi/picture_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/business_unknown.png b/InCallUI/res/drawable-xxhdpi/business_unknown.png
deleted file mode 100644
index 6273bb324..000000000
--- a/InCallUI/res/drawable-xxhdpi/business_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/img_business.png b/InCallUI/res/drawable-xxhdpi/img_business.png
new file mode 100644
index 000000000..c17e4c9d8
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/img_business.png
diff --git a/InCallUI/res/drawable-xxhdpi/img_emergency.png b/InCallUI/res/drawable-xxhdpi/img_emergency.png
new file mode 100644
index 000000000..4eaaba509
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/img_emergency.png
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index 044bdba65..138575a14 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -333,7 +333,7 @@ public class CallerInfo {
     // should be displayed.
     /* package */ CallerInfo markAsEmergency(Context context) {
         phoneNumber = context.getString(R.string.emergency_call_dialog_number_for_display);
-        photoResource = R.drawable.picture_emergency;
+        photoResource = R.drawable.img_emergency;
         mIsEmergency = true;
         return this;
     }
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index d81acb2d9..ccf5b794b 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -233,7 +233,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete
             // If no image and it's a business, switch to using the default business avatar.
             if (info.getImageUrl() == null && info.isBusiness()) {
                 Log.d(TAG, "Business has no image. Using default.");
-                entry.photo = mContext.getResources().getDrawable(R.drawable.business_unknown);
+                entry.photo = mContext.getResources().getDrawable(R.drawable.img_business);
             }
 
             // Add the contact info to the cache.