merge in master-release history after reset to 23ec4136eece7ed905991e33cffd507601d48de5
diff --git a/res-common/drawable-hdpi/ic_dial_action_vm.png b/res-common/drawable-hdpi/ic_dial_action_vm.png
deleted file mode 100644
index f424304..0000000
--- a/res-common/drawable-hdpi/ic_dial_action_vm.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_dialpad_vm.png b/res-common/drawable-hdpi/ic_dialpad_vm.png
new file mode 100644
index 0000000..9501300
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_dialpad_vm.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_dial_action_vm.png b/res-common/drawable-mdpi/ic_dial_action_vm.png
deleted file mode 100644
index fbcf378..0000000
--- a/res-common/drawable-mdpi/ic_dial_action_vm.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_dialpad_vm.png b/res-common/drawable-mdpi/ic_dialpad_vm.png
new file mode 100644
index 0000000..f32d8bf
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_dialpad_vm.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_dial_action_vm.png b/res-common/drawable-xhdpi/ic_dial_action_vm.png
deleted file mode 100644
index 2919bbd..0000000
--- a/res-common/drawable-xhdpi/ic_dial_action_vm.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_dialpad_vm.png b/res-common/drawable-xhdpi/ic_dialpad_vm.png
new file mode 100644
index 0000000..5d87c50
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_dialpad_vm.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_dial_action_vm.png b/res-common/drawable-xxhdpi/ic_dial_action_vm.png
deleted file mode 100644
index acac8d8..0000000
--- a/res-common/drawable-xxhdpi/ic_dial_action_vm.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_dialpad_vm.png b/res-common/drawable-xxhdpi/ic_dialpad_vm.png
new file mode 100644
index 0000000..ac20fab
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_dialpad_vm.png
Binary files differ
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index ecbcf07..1e7d1da 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -42,10 +42,12 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
android:id="@+id/dialpad_key_voicemail"
- android:src="@drawable/ic_dial_action_vm"
+ android:src="@drawable/ic_dialpad_vm"
android:scaleType="fitCenter"
- android:layout_centerInParent="true" />
+ android:layout_centerInParent="true"
+ android:tint="@color/dialpad_secondary_text_color" />
<!-- Place empty text view so vertical height is same as other dialpad keys. -->
<TextView style="@style/DialpadKeyLettersStyle" />
</RelativeLayout>
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index f46f90e..fd0466d 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -88,8 +88,7 @@
<color name="background_dialpad">#ffffff</color>
<color name="background_dialpad_pressed">#ececec</color>
<color name="dialpad_primary_text_color">#26c6da</color>
- <!-- Secondary color of dialpad text; black at 40% opacity. -->
- <color name="dialpad_secondary_text_color">#66000000</color>
+ <color name="dialpad_secondary_text_color">#999999</color>
<!-- 75% opacity, black. -->
<color name="dialpad_digits_text_color">#bf000000</color>
<color name="dialpad_separator_line_color">#dadada</color>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 29dc4d4..7973bc4 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -122,6 +122,8 @@
<dimen name="dialpad_digits_margin_bottom">0px</dimen>
<dimen name="dialpad_center_margin">3dp</dimen>
<dimen name="dialpad_button_margin">2dp</dimen>
+ <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
+
<dimen name="dialpad_key_button_translate_y">100dp</dimen>
</resources>
