Change app icon, primary color, FAB color and snackbar action color(1/2)
1) New round launcher with dark blue color for all devices
2) set primary color to #2a56c6 (including action bar, list headers,
all buttons)
3) set status bar color to #2a56c6
4) set fab color to #f50057
5) set snackbar action text color to #ffffff
Bug: 32243198
Test: Manual test on nexus 5x, nexus 7 and pixel
Change-Id: Iab8b224ee416729c17ba32d2cb5f3250c8298fcb
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 20e0a65..008c66f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,8 +29,7 @@
<application
android:name="com.android.contacts.ContactsApplication"
android:label="@string/applicationLabel"
- android:icon="@mipmap/ic_contacts_launcher_square"
- android:roundIcon="@mipmap/ic_contacts_launcher"
+ android:icon="@mipmap/ic_contacts_launcher"
android:taskAffinity="android.task.contacts"
android:hardwareAccelerated="true"
android:supportsRtl="true"
diff --git a/res-icons/mipmap-hdpi/ic_contacts_launcher.png b/res-icons/mipmap-hdpi/ic_contacts_launcher.png
index 86380d1..0fd1492 100644
--- a/res-icons/mipmap-hdpi/ic_contacts_launcher.png
+++ b/res-icons/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-hdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
deleted file mode 100644
index 64eff00..0000000
--- a/res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
+++ /dev/null
Binary files differ
diff --git a/res-icons/mipmap-mdpi/ic_contacts_launcher.png b/res-icons/mipmap-mdpi/ic_contacts_launcher.png
index 85132c5..e23930b 100644
--- a/res-icons/mipmap-mdpi/ic_contacts_launcher.png
+++ b/res-icons/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-mdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
deleted file mode 100644
index b4ee821..0000000
--- a/res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
+++ /dev/null
Binary files differ
diff --git a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
index c198749..aff0f31 100644
--- a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
+++ b/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
deleted file mode 100644
index 6feeadf..0000000
--- a/res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
+++ /dev/null
Binary files differ
diff --git a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
index 4fa10a6..9cd2ebe 100644
--- a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
+++ b/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
deleted file mode 100644
index 01a3fde..0000000
--- a/res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
+++ /dev/null
Binary files differ
diff --git a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
index 10bda63..74c4179 100644
--- a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
deleted file mode 100644
index 328e067..0000000
--- a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/fab_blue.png b/res/drawable-hdpi/fab_blue.png
deleted file mode 100644
index 8ff3d29..0000000
--- a/res/drawable-hdpi/fab_blue.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/fab_pink.png b/res/drawable-hdpi/fab_pink.png
new file mode 100644
index 0000000..98b26d5
--- /dev/null
+++ b/res/drawable-hdpi/fab_pink.png
Binary files differ
diff --git a/res/drawable-mdpi/fab_blue.png b/res/drawable-mdpi/fab_blue.png
deleted file mode 100644
index 2ca6b4b..0000000
--- a/res/drawable-mdpi/fab_blue.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/fab_pink.png b/res/drawable-mdpi/fab_pink.png
new file mode 100644
index 0000000..46df9f8
--- /dev/null
+++ b/res/drawable-mdpi/fab_pink.png
Binary files differ
diff --git a/res/drawable-xhdpi/fab_blue.png b/res/drawable-xhdpi/fab_blue.png
deleted file mode 100644
index 300b07e..0000000
--- a/res/drawable-xhdpi/fab_blue.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/fab_pink.png b/res/drawable-xhdpi/fab_pink.png
new file mode 100644
index 0000000..5f214d6
--- /dev/null
+++ b/res/drawable-xhdpi/fab_pink.png
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_blue.png b/res/drawable-xxhdpi/fab_blue.png
deleted file mode 100644
index 76d68ac..0000000
--- a/res/drawable-xxhdpi/fab_blue.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_pink.png b/res/drawable-xxhdpi/fab_pink.png
new file mode 100644
index 0000000..6fbe669
--- /dev/null
+++ b/res/drawable-xxhdpi/fab_pink.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_blue.png b/res/drawable-xxxhdpi/fab_blue.png
deleted file mode 100644
index 1dd8a92..0000000
--- a/res/drawable-xxxhdpi/fab_blue.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_pink.png b/res/drawable-xxxhdpi/fab_pink.png
new file mode 100644
index 0000000..5513227
--- /dev/null
+++ b/res/drawable-xxxhdpi/fab_pink.png
Binary files differ
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
index 91afecd..a20d657 100644
--- a/res/layout/floating_action_button.xml
+++ b/res/layout/floating_action_button.xml
@@ -26,7 +26,7 @@
android:layout_gravity="bottom|end"
android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
android:layout_marginEnd="@dimen/floating_action_button_margin_right"
- android:background="@drawable/fab_blue"
+ android:background="@drawable/fab_pink"
android:elevation="@dimen/design_fab_elevation"
app:layout_dodgeInsetEdges="bottom" >
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e2024fd..6dbe010 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,7 +27,7 @@
<color name="quickcontact_entry_sub_header_text_color">#737373</color>
<color name="quickcontact_entry_header_text_color">#202020</color>
- <color name="action_bar_background">#0288d1</color>
+ <color name="action_bar_background">#2a56c6</color>
<color name="nav_item_selected_background">#0f000000</color>
@@ -42,8 +42,8 @@
<!-- Color of the status bar above the contextual selection bar. -->
<color name="contextual_selection_bar_status_bar_color">#bababa</color>
- <color name="primary_color_dark">#0277bd</color>
- <color name="primary_color">#0288d1</color>
+ <color name="primary_color_dark">#2a56c6</color>
+ <color name="primary_color">#2a56c6</color>
<color name="group_primary_color_dark">#546E7A</color>
<color name="group_primary_color">#607D8B</color>
@@ -121,7 +121,7 @@
<color name="people_app_theme_color">#363636</color>
<!-- Color of the theme of the Dialer app -->
- <color name="dialtacts_theme_color">#0288d1</color>
+ <color name="dialtacts_theme_color">#2a56c6</color>
<!-- Color of image view placeholder. -->
<color name="image_placeholder">#DDDDDD</color>
@@ -245,7 +245,7 @@
<color name="search_video_call_icon_tint">@color/searchbox_hint_text_color</color>
<!-- Text color for an action in a snackbar. -->
- <color name="snackbar_action_text">#40c4ff</color>
+ <color name="snackbar_action_text">#ffffff</color>
<!-- Background color for a snackbar. -->
<color name="snackbar_background">#333333</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fc52bc5..ad0915e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -397,7 +397,7 @@
<!-- Button style for main contacts no account empty view. -->
<style name="NoAccountViewButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
<item name="android:textSize">14sp</item>
- <item name="android:textColor">#0288d1</item>
+ <item name="android:textColor">@color/primary_color</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textAllCaps">true</item>
</style>
@@ -405,7 +405,7 @@
<!-- Add contacts button style for empty states. -->
<style name="AddContactsButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
<item name="android:textSize">16sp</item>
- <item name="android:textColor">#0288d1</item>
+ <item name="android:textColor">@color/primary_color</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textAllCaps">true</item>
</style>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index b26a52f..307427f 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -754,7 +754,8 @@
ContactSaveService.startService(PeopleActivity.this,
ContactSaveService.createUndoIntent(PeopleActivity.this, intent));
}
- }).show();
+ }).setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_text))
+ .show();
}
private class SaveServiceListener extends BroadcastReceiver {
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 472ee1c..740e293 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -36,8 +36,7 @@
<uses-permission android:name="android.permission.READ_SOCIAL_STREAM" />
<application
- android:icon="@mipmap/ic_contacts_launcher_square"
- android:roundIcon="@mipmap/ic_contacts_launcher"
+ android:icon="@mipmap/ic_contacts_launcher"
android:label="@string/applicationLabel">
<uses-library android:name="android.test.runner" />
diff --git a/tests/res/xml/contacts_contactsdatakind.xml b/tests/res/xml/contacts_contactsdatakind.xml
index c7d3bd9..20c85ad 100644
--- a/tests/res/xml/contacts_contactsdatakind.xml
+++ b/tests/res/xml/contacts_contactsdatakind.xml
@@ -24,7 +24,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
accountType="com.android.contacts.tests.testauth.basic"
accountTypeLabel="@string/applicationLabel"
- accountTypeIcon="@mipmap/ic_contacts_launcher_square"
+ accountTypeIcon="@mipmap/ic_contacts_launcher"
>
<EditSchema
>
@@ -96,7 +96,7 @@
<ContactsDataKind
android:mimeType="vnd.android.cursor.item/vnd.contactstest.profile"
- android:icon="@mipmap/ic_contacts_launcher_square"
+ android:icon="@mipmap/ic_contacts_launcher"
android:summaryColumn="data2"
android:detailColumn="data3" />
diff --git a/tests/res/xml/test_basic_authenticator.xml b/tests/res/xml/test_basic_authenticator.xml
index 83bd135..40b9088 100644
--- a/tests/res/xml/test_basic_authenticator.xml
+++ b/tests/res/xml/test_basic_authenticator.xml
@@ -19,7 +19,7 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="com.android.contacts.tests.testauth.basic"
- android:icon="@mipmap/ic_contacts_launcher_square"
- android:smallIcon="@mipmap/ic_contacts_launcher_square"
+ android:icon="@mipmap/ic_contacts_launcher"
+ android:smallIcon="@mipmap/ic_contacts_launcher"
android:label="@string/applicationLabel"
/>
