Automated import from //branches/donutburger/...@140648,140648
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e0aadd5..71a90eb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -241,7 +241,8 @@
<activity-alias android:name="ContactShortcut"
android:targetActivity="ContactsListActivity"
- android:label="@string/shortcutContact">
+ android:label="@string/shortcutContact"
+ android:icon="@drawable/ic_launcher_shortcut_contact">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -252,7 +253,7 @@
<activity android:name="CallDetailActivity"
android:label="@string/callDetailTitle"
- android:theme="@android:style/Theme.NoTitleBar"
+ android:theme="@style/TallTitleBarTheme"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -264,7 +265,7 @@
<!-- Views the details of a single contact -->
<activity android:name="ViewContactActivity"
android:label="@string/viewContactTitle"
- android:theme="@android:style/Theme.NoTitleBar"
+ android:theme="@style/TallTitleBarTheme"
>
<intent-filter android:label="@string/viewContactDesription">
<action android:name="android.intent.action.VIEW" />
@@ -314,7 +315,7 @@
<activity
android:name=".ContactsLiveFolders$AllContacts"
android:label="@string/liveFolderAll"
- android:icon="@drawable/ic_launcher_contacts">
+ android:icon="@drawable/ic_launcher_folder_live_contacts">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
@@ -324,7 +325,7 @@
<activity
android:name=".ContactsLiveFolders$StarredContacts"
android:label="@string/liveFolderFavorites"
- android:icon="@drawable/ic_launcher_contacts_starred">
+ android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
@@ -334,7 +335,7 @@
<activity
android:name=".ContactsLiveFolders$PhoneContacts"
android:label="@string/liveFolderPhone"
- android:icon="@drawable/ic_launcher_contacts_phones">
+ android:icon="@drawable/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/drawable/ic_launcher_contacts_phones.png b/res/drawable/ic_launcher_contacts_phones.png
deleted file mode 100644
index 822cc31..0000000
--- a/res/drawable/ic_launcher_contacts_phones.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_launcher_contacts_starred.png b/res/drawable/ic_launcher_contacts_starred.png
deleted file mode 100644
index 328761e..0000000
--- a/res/drawable/ic_launcher_contacts_starred.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_launcher_folder_live_contacts.png b/res/drawable/ic_launcher_folder_live_contacts.png
new file mode 100644
index 0000000..5e222ec
--- /dev/null
+++ b/res/drawable/ic_launcher_folder_live_contacts.png
Binary files differ
diff --git a/res/drawable/ic_launcher_folder_live_contacts_phone.png b/res/drawable/ic_launcher_folder_live_contacts_phone.png
new file mode 100644
index 0000000..02637da
--- /dev/null
+++ b/res/drawable/ic_launcher_folder_live_contacts_phone.png
Binary files differ
diff --git a/res/drawable/ic_launcher_folder_live_contacts_starred.png b/res/drawable/ic_launcher_folder_live_contacts_starred.png
new file mode 100644
index 0000000..927b343
--- /dev/null
+++ b/res/drawable/ic_launcher_folder_live_contacts_starred.png
Binary files differ
diff --git a/res/drawable/ic_launcher_shortcut_contact.png b/res/drawable/ic_launcher_shortcut_contact.png
new file mode 100644
index 0000000..ed7025c
--- /dev/null
+++ b/res/drawable/ic_launcher_shortcut_contact.png
Binary files differ
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e43842c..c202eda 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,4 +31,8 @@
<item name="android:src">@drawable/ic_btn_round_more</item>
</style>
+ <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+
</resources>
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 5ba0ec5..f8069c5 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1039,7 +1039,7 @@
} else {
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
Intent.ShortcutIconResource.fromContext(this,
- R.drawable.ic_launcher_contacts));
+ R.drawable.ic_launcher_shortcut_contact));
}
setResult(RESULT_OK, intent);
} else {
diff --git a/src/com/android/contacts/ContactsLiveFolders.java b/src/com/android/contacts/ContactsLiveFolders.java
index 8ca199a..d437e80 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_contacts_starred));
+ R.drawable.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_contacts_phones));
+ R.drawable.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_contacts));
+ R.drawable.ic_launcher_folder_live_contacts));
} else {
setResult(RESULT_CANCELED);
}
