Use Mipmap for icon to support big screen
Change-Id: I65da1da18af01a1529b3d1a8ef656f5249a45f9f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b72bdce..a1a935e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,7 +38,7 @@
<application
android:label="@string/contactsList"
- android:icon="@drawable/ic_launcher_contacts"
+ android:icon="@mipmap/ic_launcher_contacts"
android:process="android.process.acore"
android:taskAffinity="android.task.contacts"
android:hardwareAccelerated="true"
@@ -123,7 +123,7 @@
android:theme="@style/DialtactsTheme"
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
- android:icon="@drawable/ic_launcher_phone"
+ android:icon="@mipmap/ic_launcher_phone"
android:screenOrientation="nosensor"
android:enabled="@*android:bool/config_voice_capable"
>
@@ -173,7 +173,7 @@
<!-- Front door proxy that picks the right UI based on the screen config -->
<activity android:name=".activities.ContactsFrontDoor"
android:label="@string/contactsList"
- android:icon="@drawable/ic_launcher_contacts"
+ android:icon="@mipmap/ic_launcher_contacts"
android:theme="@android:style/Theme.NoTitleBar"
>
<intent-filter>
@@ -376,7 +376,7 @@
<activity-alias android:name="ContactShortcut"
android:targetActivity=".activities.ContactSelectionActivity"
android:label="@string/shortcutContact"
- android:icon="@drawable/ic_launcher_shortcut_contact">
+ android:icon="@mipmap/ic_launcher_shortcut_contact">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -388,7 +388,7 @@
<activity-alias android:name="alias.DialShortcut"
android:targetActivity=".activities.ContactSelectionActivity"
android:label="@string/shortcutDialContact"
- android:icon="@drawable/ic_launcher_shortcut_directdial"
+ android:icon="@mipmap/ic_launcher_shortcut_directdial"
android:enabled="@*android:bool/config_voice_capable">
<intent-filter>
@@ -402,7 +402,7 @@
<activity-alias android:name="alias.MessageShortcut"
android:targetActivity=".activities.ContactSelectionActivity"
android:label="@string/shortcutMessageContact"
- android:icon="@drawable/ic_launcher_shortcut_directmessage"
+ android:icon="@mipmap/ic_launcher_shortcut_directmessage"
android:enabled="@*android:bool/config_voice_capable">
<intent-filter>
@@ -504,7 +504,7 @@
<activity
android:name=".ContactsLiveFolders$AllContacts"
android:label="@string/liveFolderAll"
- android:icon="@drawable/ic_launcher_folder_live_contacts">
+ android:icon="@mipmap/ic_launcher_folder_live_contacts">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
@@ -514,7 +514,7 @@
<activity
android:name=".ContactsLiveFolders$StarredContacts"
android:label="@string/liveFolderFavorites"
- android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
+ android:icon="@mipmap/ic_launcher_folder_live_contacts_starred">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
@@ -524,7 +524,7 @@
<activity
android:name=".ContactsLiveFolders$PhoneContacts"
android:label="@string/liveFolderPhone"
- android:icon="@drawable/ic_launcher_folder_live_contacts_phone">
+ android:icon="@mipmap/ic_launcher_folder_live_contacts_phone">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 304c35d..7dfd8ec 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -46,7 +46,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_launcher_contacts"
+ android:src="@mipmap/ic_launcher_contacts"
android:layout_marginRight="7dip"
android:layout_gravity="center_vertical"
android:scaleType="centerInside" />
diff --git a/res/drawable-hdpi/ic_launcher_contacts.png b/res/mipmap-hdpi/ic_launcher_contacts.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_contacts.png
rename to res/mipmap-hdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder_live_contacts.png b/res/mipmap-hdpi/ic_launcher_folder_live_contacts.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_folder_live_contacts.png
rename to res/mipmap-hdpi/ic_launcher_folder_live_contacts.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder_live_contacts_phone.png b/res/mipmap-hdpi/ic_launcher_folder_live_contacts_phone.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_folder_live_contacts_phone.png
rename to res/mipmap-hdpi/ic_launcher_folder_live_contacts_phone.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder_live_contacts_starred.png b/res/mipmap-hdpi/ic_launcher_folder_live_contacts_starred.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_folder_live_contacts_starred.png
rename to res/mipmap-hdpi/ic_launcher_folder_live_contacts_starred.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_phone.png b/res/mipmap-hdpi/ic_launcher_phone.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_phone.png
rename to res/mipmap-hdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_contact.png b/res/mipmap-hdpi/ic_launcher_shortcut_contact.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_shortcut_contact.png
rename to res/mipmap-hdpi/ic_launcher_shortcut_contact.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_directdial.png b/res/mipmap-hdpi/ic_launcher_shortcut_directdial.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_shortcut_directdial.png
rename to res/mipmap-hdpi/ic_launcher_shortcut_directdial.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_directmessage.png b/res/mipmap-hdpi/ic_launcher_shortcut_directmessage.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_shortcut_directmessage.png
rename to res/mipmap-hdpi/ic_launcher_shortcut_directmessage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_contacts.png b/res/mipmap-mdpi/ic_launcher_contacts.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_contacts.png
rename to res/mipmap-mdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_live_contacts.png b/res/mipmap-mdpi/ic_launcher_folder_live_contacts.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_folder_live_contacts.png
rename to res/mipmap-mdpi/ic_launcher_folder_live_contacts.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_live_contacts_phone.png b/res/mipmap-mdpi/ic_launcher_folder_live_contacts_phone.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_folder_live_contacts_phone.png
rename to res/mipmap-mdpi/ic_launcher_folder_live_contacts_phone.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_live_contacts_starred.png b/res/mipmap-mdpi/ic_launcher_folder_live_contacts_starred.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_folder_live_contacts_starred.png
rename to res/mipmap-mdpi/ic_launcher_folder_live_contacts_starred.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_phone.png b/res/mipmap-mdpi/ic_launcher_phone.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_phone.png
rename to res/mipmap-mdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_contact.png b/res/mipmap-mdpi/ic_launcher_shortcut_contact.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_shortcut_contact.png
rename to res/mipmap-mdpi/ic_launcher_shortcut_contact.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_directdial.png b/res/mipmap-mdpi/ic_launcher_shortcut_directdial.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_shortcut_directdial.png
rename to res/mipmap-mdpi/ic_launcher_shortcut_directdial.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_directmessage.png b/res/mipmap-mdpi/ic_launcher_shortcut_directmessage.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_shortcut_directmessage.png
rename to res/mipmap-mdpi/ic_launcher_shortcut_directmessage.png
Binary files differ
diff --git a/src/com/android/contacts/ContactsLiveFolders.java b/src/com/android/contacts/ContactsLiveFolders.java
index 64be0e2..9cb7e72 100644
--- a/src/com/android/contacts/ContactsLiveFolders.java
+++ b/src/com/android/contacts/ContactsLiveFolders.java
@@ -39,7 +39,7 @@
if (LiveFolders.ACTION_CREATE_LIVE_FOLDER.equals(action)) {
setResult(RESULT_OK, createLiveFolder(this, CONTENT_URI,
getString(R.string.liveFolder_favorites_label),
- R.drawable.ic_launcher_folder_live_contacts_starred));
+ R.mipmap.ic_launcher_folder_live_contacts_starred));
} else {
setResult(RESULT_CANCELED);
}
@@ -62,7 +62,7 @@
if (LiveFolders.ACTION_CREATE_LIVE_FOLDER.equals(action)) {
setResult(RESULT_OK, createLiveFolder(this, CONTENT_URI,
getString(R.string.liveFolder_phones_label),
- R.drawable.ic_launcher_folder_live_contacts_phone));
+ R.mipmap.ic_launcher_folder_live_contacts_phone));
} else {
setResult(RESULT_CANCELED);
}
@@ -85,7 +85,7 @@
if (LiveFolders.ACTION_CREATE_LIVE_FOLDER.equals(action)) {
setResult(RESULT_OK, createLiveFolder(this, CONTENT_URI,
getString(R.string.liveFolder_all_label),
- R.drawable.ic_launcher_folder_live_contacts));
+ R.mipmap.ic_launcher_folder_live_contacts));
} else {
setResult(RESULT_CANCELED);
}
diff --git a/src/com/android/contacts/model/FallbackAccountType.java b/src/com/android/contacts/model/FallbackAccountType.java
index 2b40634..a51f850 100644
--- a/src/com/android/contacts/model/FallbackAccountType.java
+++ b/src/com/android/contacts/model/FallbackAccountType.java
@@ -65,7 +65,7 @@
public FallbackAccountType() {
this.accountType = null;
this.titleRes = R.string.account_phone;
- this.iconRes = R.drawable.ic_launcher_contacts;
+ this.iconRes = R.mipmap.ic_launcher_contacts;
}
@Override
