Merge "Import translations. DO NOT MERGE" into lmp-dev
diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_blue.png
similarity index 97%
rename from res/drawable-hdpi/fab_teal_background.png
rename to res/drawable-hdpi/fab_blue.png
index b36439e..8ff3d29 100644
--- a/res/drawable-hdpi/fab_teal_background.png
+++ b/res/drawable-hdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_voicemail_holo_dark.png b/res/drawable-hdpi/ic_call_voicemail_holo_dark.png
deleted file mode 100644
index 6d64a36..0000000
--- a/res/drawable-hdpi/ic_call_voicemail_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_blue.png
similarity index 96%
rename from res/drawable-mdpi/fab_teal_background.png
rename to res/drawable-mdpi/fab_blue.png
index 55f9bb5..2ca6b4b 100644
--- a/res/drawable-mdpi/fab_teal_background.png
+++ b/res/drawable-mdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_voicemail_holo_dark.png b/res/drawable-mdpi/ic_call_voicemail_holo_dark.png
deleted file mode 100644
index bf6d006..0000000
--- a/res/drawable-mdpi/ic_call_voicemail_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_blue.png
similarity index 98%
rename from res/drawable-xhdpi/fab_teal_background.png
rename to res/drawable-xhdpi/fab_blue.png
index d6379c2..300b07e 100644
--- a/res/drawable-xhdpi/fab_teal_background.png
+++ b/res/drawable-xhdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png b/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png
deleted file mode 100644
index d9684d1..0000000
--- a/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_blue.png
similarity index 100%
rename from res/drawable-xxhdpi/fab_teal_background.png
rename to res/drawable-xxhdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_call_voicemail_holo_dark.png b/res/drawable-xxhdpi/ic_call_voicemail_holo_dark.png
deleted file mode 100644
index ac5b83b..0000000
--- a/res/drawable-xxhdpi/ic_call_voicemail_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index d518ddd..347e9d4 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -17,5 +17,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/dialer_accent_color">
- <item android:drawable="@drawable/fab_teal_background" />
+ <item android:drawable="@drawable/fab_blue" />
</ripple>
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 5f2d2a9..208e350 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -43,9 +43,9 @@
private static final boolean DEBUG = false;
// These parameters instruct the photo manager to display the default image/letter at 70% of
- // its normal size, and vertically offset upwards 14% towards the top of the letter tile, to
+ // its normal size, and vertically offset upwards 12% towards the top of the letter tile, to
// make room for the contact name and number label at the bottom of the image.
- private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.14f;
+ private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.12f;
private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.70f;
/** View that contains the transparent shadow that is overlaid on top of the contact image. */
