New dial numbers and backgrounds for the Contacts dialer.
UI overhaul for the dialer in the contacts app.
This CL changes the buttons only.
We lost the voice mail symbol on the '1' button but
the functionality is still there. A separate button
for the VM will be added at the bottom in a separate CL.
Removed the old button assets and added new ones in
the new mdpi and hdpi directories.
Fixed ButtonGridLayout to put the right amount of vertical
padding between buttons.
Also fixed a small bug in the loop to measure each child (was
measuring child 0 instead of child i.
dialpad.xml, converted px to dp units.
Adjusted the size of the buttons and padding.
Bug: 2104523
diff --git a/res/drawable-finger/btn_dial.xml b/res/drawable-finger/btn_dial.xml
index 4dfcd64..22a785a 100644
--- a/res/drawable-finger/btn_dial.xml
+++ b/res/drawable-finger/btn_dial.xml
@@ -14,6 +14,9 @@
limitations under the License.
-->
+<!-- Background resource for digit buttons in the various dialpads
+ used by the Contacts app (see dialpad.xml).
+ -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_dial_pressed" />
diff --git a/res/drawable-finger/btn_dial_normal.png b/res/drawable-finger/btn_dial_normal.png
deleted file mode 100644
index ff8796b..0000000
--- a/res/drawable-finger/btn_dial_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_pressed.png b/res/drawable-finger/btn_dial_pressed.png
deleted file mode 100644
index 3c198c4..0000000
--- a/res/drawable-finger/btn_dial_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_selected.png b/res/drawable-finger/btn_dial_selected.png
deleted file mode 100644
index 8ca2b0d..0000000
--- a/res/drawable-finger/btn_dial_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_0_blk.png b/res/drawable-finger/dial_num_0_blk.png
deleted file mode 100644
index a10c601..0000000
--- a/res/drawable-finger/dial_num_0_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_0_wht.png b/res/drawable-finger/dial_num_0_wht.png
deleted file mode 100644
index 2de90a1..0000000
--- a/res/drawable-finger/dial_num_0_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_1_blk.png b/res/drawable-finger/dial_num_1_blk.png
deleted file mode 100644
index 822f9ca..0000000
--- a/res/drawable-finger/dial_num_1_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_1.xml b/res/drawable-finger/dial_num_1_no_vm.xml
similarity index 78%
rename from res/drawable-finger/dial_num_1.xml
rename to res/drawable-finger/dial_num_1_no_vm.xml
index 48737b2..daa4613 100644
--- a/res/drawable-finger/dial_num_1.xml
+++ b/res/drawable-finger/dial_num_1_no_vm.xml
@@ -15,11 +15,11 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/dial_num_1_blk" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/dial_num_1_no_vm_blk" />
<item android:state_focused="true"
- android:drawable="@drawable/dial_num_1_blk" />
+ android:drawable="@drawable/dial_num_1_no_vm_blk" />
<item
- android:drawable="@drawable/dial_num_1_wht" />
+ android:drawable="@drawable/dial_num_1_no_vm_wht" />
</selector>
diff --git a/res/drawable-finger/dial_num_1_wht.png b/res/drawable-finger/dial_num_1_wht.png
deleted file mode 100644
index e488beb..0000000
--- a/res/drawable-finger/dial_num_1_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_2_blk.png b/res/drawable-finger/dial_num_2_blk.png
deleted file mode 100644
index 539c301..0000000
--- a/res/drawable-finger/dial_num_2_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_2_wht.png b/res/drawable-finger/dial_num_2_wht.png
deleted file mode 100644
index cd1ae8d..0000000
--- a/res/drawable-finger/dial_num_2_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_3_blk.png b/res/drawable-finger/dial_num_3_blk.png
deleted file mode 100644
index dc70f33..0000000
--- a/res/drawable-finger/dial_num_3_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_3_wht.png b/res/drawable-finger/dial_num_3_wht.png
deleted file mode 100644
index dc7c8e2..0000000
--- a/res/drawable-finger/dial_num_3_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_4_blk.png b/res/drawable-finger/dial_num_4_blk.png
deleted file mode 100644
index 084db44..0000000
--- a/res/drawable-finger/dial_num_4_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_4_wht.png b/res/drawable-finger/dial_num_4_wht.png
deleted file mode 100644
index 44128a1..0000000
--- a/res/drawable-finger/dial_num_4_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_5_blk.png b/res/drawable-finger/dial_num_5_blk.png
deleted file mode 100644
index 0a06f20..0000000
--- a/res/drawable-finger/dial_num_5_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_5_wht.png b/res/drawable-finger/dial_num_5_wht.png
deleted file mode 100644
index fc605b8..0000000
--- a/res/drawable-finger/dial_num_5_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_6_blk.png b/res/drawable-finger/dial_num_6_blk.png
deleted file mode 100644
index 2498d77..0000000
--- a/res/drawable-finger/dial_num_6_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_6_wht.png b/res/drawable-finger/dial_num_6_wht.png
deleted file mode 100644
index 086e8ce..0000000
--- a/res/drawable-finger/dial_num_6_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_7_blk.png b/res/drawable-finger/dial_num_7_blk.png
deleted file mode 100644
index cfb20a7..0000000
--- a/res/drawable-finger/dial_num_7_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_7_wht.png b/res/drawable-finger/dial_num_7_wht.png
deleted file mode 100644
index cb1b097..0000000
--- a/res/drawable-finger/dial_num_7_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_8_blk.png b/res/drawable-finger/dial_num_8_blk.png
deleted file mode 100644
index 845ee68..0000000
--- a/res/drawable-finger/dial_num_8_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_8_wht.png b/res/drawable-finger/dial_num_8_wht.png
deleted file mode 100644
index 1954f10..0000000
--- a/res/drawable-finger/dial_num_8_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_9_blk.png b/res/drawable-finger/dial_num_9_blk.png
deleted file mode 100644
index 752df25..0000000
--- a/res/drawable-finger/dial_num_9_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dial_num_9_wht.png b/res/drawable-finger/dial_num_9_wht.png
deleted file mode 100644
index d8b5aa1..0000000
--- a/res/drawable-finger/dial_num_9_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_normal.9.png b/res/drawable-hdpi-finger/btn_dial_normal.9.png
new file mode 100755
index 0000000..5702e47
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_dial_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_pressed.9.png
new file mode 100755
index 0000000..a5b51d5
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_dial_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_selected.9.png b/res/drawable-hdpi-finger/btn_dial_selected.9.png
new file mode 100755
index 0000000..b578146
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_dial_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_blk.png b/res/drawable-hdpi-finger/dial_num_0_blk.png
new file mode 100755
index 0000000..960d968
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_0_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_wht.png b/res/drawable-hdpi-finger/dial_num_0_wht.png
new file mode 100755
index 0000000..c257817
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
new file mode 100755
index 0000000..d150354
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
new file mode 100755
index 0000000..9a1152b
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_blk.png b/res/drawable-hdpi-finger/dial_num_2_blk.png
new file mode 100755
index 0000000..7b0cee7
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_2_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_wht.png b/res/drawable-hdpi-finger/dial_num_2_wht.png
new file mode 100755
index 0000000..cad5485
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_blk.png b/res/drawable-hdpi-finger/dial_num_3_blk.png
new file mode 100755
index 0000000..d2efe88
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_3_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_wht.png b/res/drawable-hdpi-finger/dial_num_3_wht.png
new file mode 100755
index 0000000..ddb890c
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_blk.png b/res/drawable-hdpi-finger/dial_num_4_blk.png
new file mode 100755
index 0000000..fc3ed43
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_4_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_wht.png b/res/drawable-hdpi-finger/dial_num_4_wht.png
new file mode 100755
index 0000000..bb8064c
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_blk.png b/res/drawable-hdpi-finger/dial_num_5_blk.png
new file mode 100755
index 0000000..5c78c75
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_5_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_wht.png b/res/drawable-hdpi-finger/dial_num_5_wht.png
new file mode 100755
index 0000000..1368d36
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_blk.png b/res/drawable-hdpi-finger/dial_num_6_blk.png
new file mode 100755
index 0000000..583fb2a
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_6_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_wht.png b/res/drawable-hdpi-finger/dial_num_6_wht.png
new file mode 100755
index 0000000..7f1bf4a
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_blk.png b/res/drawable-hdpi-finger/dial_num_7_blk.png
new file mode 100755
index 0000000..793660b
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_7_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_wht.png b/res/drawable-hdpi-finger/dial_num_7_wht.png
new file mode 100755
index 0000000..d8038c7
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_blk.png b/res/drawable-hdpi-finger/dial_num_8_blk.png
new file mode 100755
index 0000000..0ee87fe
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_8_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_wht.png b/res/drawable-hdpi-finger/dial_num_8_wht.png
new file mode 100755
index 0000000..9d0d0eb
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_blk.png b/res/drawable-hdpi-finger/dial_num_9_blk.png
new file mode 100755
index 0000000..920235a
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_9_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_wht.png b/res/drawable-hdpi-finger/dial_num_9_wht.png
new file mode 100755
index 0000000..ac3727d
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_blk.png b/res/drawable-hdpi-finger/dial_num_pound_blk.png
new file mode 100755
index 0000000..fcfc58c
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_pound_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_wht.png b/res/drawable-hdpi-finger/dial_num_pound_wht.png
new file mode 100755
index 0000000..df67810
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_blk.png b/res/drawable-hdpi-finger/dial_num_star_blk.png
new file mode 100755
index 0000000..ddda118
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_star_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_wht.png b/res/drawable-hdpi-finger/dial_num_star_wht.png
new file mode 100755
index 0000000..ded1900
--- /dev/null
+++ b/res/drawable-hdpi-finger/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_normal.9.png b/res/drawable-mdpi-finger/btn_dial_normal.9.png
new file mode 100755
index 0000000..748dd8a
--- /dev/null
+++ b/res/drawable-mdpi-finger/btn_dial_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_pressed.9.png
new file mode 100755
index 0000000..83f9c62
--- /dev/null
+++ b/res/drawable-mdpi-finger/btn_dial_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_selected.9.png b/res/drawable-mdpi-finger/btn_dial_selected.9.png
new file mode 100755
index 0000000..edc7bcb
--- /dev/null
+++ b/res/drawable-mdpi-finger/btn_dial_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_0_blk.png b/res/drawable-mdpi-finger/dial_num_0_blk.png
new file mode 100755
index 0000000..d04add7
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_0_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_0_wht.png b/res/drawable-mdpi-finger/dial_num_0_wht.png
new file mode 100755
index 0000000..c3b3f2c
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png
new file mode 100755
index 0000000..75a8ed8
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png b/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png
new file mode 100755
index 0000000..a5bdb41
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_2_blk.png b/res/drawable-mdpi-finger/dial_num_2_blk.png
new file mode 100755
index 0000000..1d8a35c
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_2_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_2_wht.png b/res/drawable-mdpi-finger/dial_num_2_wht.png
new file mode 100755
index 0000000..ac99cec
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_3_blk.png b/res/drawable-mdpi-finger/dial_num_3_blk.png
new file mode 100755
index 0000000..cf78e04
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_3_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_3_wht.png b/res/drawable-mdpi-finger/dial_num_3_wht.png
new file mode 100755
index 0000000..69170b9
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_4_blk.png b/res/drawable-mdpi-finger/dial_num_4_blk.png
new file mode 100755
index 0000000..c9c12c2
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_4_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_4_wht.png b/res/drawable-mdpi-finger/dial_num_4_wht.png
new file mode 100755
index 0000000..48a02a5
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_5_blk.png b/res/drawable-mdpi-finger/dial_num_5_blk.png
new file mode 100755
index 0000000..a89dd8f
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_5_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_5_wht.png b/res/drawable-mdpi-finger/dial_num_5_wht.png
new file mode 100755
index 0000000..e3c9940
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_6_blk.png b/res/drawable-mdpi-finger/dial_num_6_blk.png
new file mode 100755
index 0000000..c282afb
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_6_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_6_wht.png b/res/drawable-mdpi-finger/dial_num_6_wht.png
new file mode 100755
index 0000000..ab12781
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_7_blk.png b/res/drawable-mdpi-finger/dial_num_7_blk.png
new file mode 100755
index 0000000..df273a2
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_7_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_7_wht.png b/res/drawable-mdpi-finger/dial_num_7_wht.png
new file mode 100755
index 0000000..9e66205
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_8_blk.png b/res/drawable-mdpi-finger/dial_num_8_blk.png
new file mode 100755
index 0000000..9e5654f
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_8_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_8_wht.png b/res/drawable-mdpi-finger/dial_num_8_wht.png
new file mode 100755
index 0000000..2af30fa
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_9_blk.png b/res/drawable-mdpi-finger/dial_num_9_blk.png
new file mode 100755
index 0000000..6ae1943
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_9_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_9_wht.png b/res/drawable-mdpi-finger/dial_num_9_wht.png
new file mode 100755
index 0000000..1c99b61
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_pound_blk.png b/res/drawable-mdpi-finger/dial_num_pound_blk.png
new file mode 100755
index 0000000..add133e
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_pound_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_pound_wht.png b/res/drawable-mdpi-finger/dial_num_pound_wht.png
new file mode 100755
index 0000000..e17f2bf
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_star_blk.png b/res/drawable-mdpi-finger/dial_num_star_blk.png
new file mode 100755
index 0000000..f649f14
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_star_blk.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/dial_num_star_wht.png b/res/drawable-mdpi-finger/dial_num_star_wht.png
new file mode 100755
index 0000000..86113ed
--- /dev/null
+++ b/res/drawable-mdpi-finger/dial_num_star_wht.png
Binary files differ
diff --git a/res/layout-finger/dialpad.xml b/res/layout-finger/dialpad.xml
index 8f367e5..0acb721 100644
--- a/res/layout-finger/dialpad.xml
+++ b/res/layout-finger/dialpad.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,25 +14,28 @@
limitations under the License.
-->
+<!-- Dialpad in the Contact app.
+ -->
+
<com.android.contacts.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialpad"
- android:paddingLeft="16px"
- android:paddingRight="16px"
+ android:paddingLeft="7dp"
+ android:paddingRight="7dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<ImageButton android:id="@+id/one"
- android:layout_width="96px"
- android:layout_height="76px"
- android:src="@drawable/dial_num_1"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
+ android:src="@drawable/dial_num_1_no_vm"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
android:contentDescription="@string/description_image_button_one"
/>
-
+
<ImageButton android:id="@+id/two"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_2"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -40,8 +43,8 @@
/>
<ImageButton android:id="@+id/three"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_3"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -49,17 +52,17 @@
/>
<ImageButton android:id="@+id/four"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_4"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
android:contentDescription="@string/description_image_button_four"
/>
-
+
<ImageButton android:id="@+id/five"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_5"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -67,8 +70,8 @@
/>
<ImageButton android:id="@+id/six"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_6"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -76,17 +79,17 @@
/>
<ImageButton android:id="@+id/seven"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_7"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
android:contentDescription="@string/description_image_button_seven"
/>
-
+
<ImageButton android:id="@+id/eight"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_8"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -94,8 +97,8 @@
/>
<ImageButton android:id="@+id/nine"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_9"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -103,17 +106,17 @@
/>
<ImageButton android:id="@+id/star"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_star"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
android:contentDescription="@string/description_image_button_star"
/>
-
+
<ImageButton android:id="@+id/zero"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_0"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
@@ -121,8 +124,8 @@
/>
<ImageButton android:id="@+id/pound"
- android:layout_width="96px"
- android:layout_height="76px"
+ android:layout_width="88dp"
+ android:layout_height="50dp"
android:src="@drawable/dial_num_pound"
android:background="@drawable/btn_dial"
android:soundEffectsEnabled="false"
diff --git a/src/com/android/contacts/ButtonGridLayout.java b/src/com/android/contacts/ButtonGridLayout.java
index e3431b1..69eed97 100644
--- a/src/com/android/contacts/ButtonGridLayout.java
+++ b/src/com/android/contacts/ButtonGridLayout.java
@@ -25,7 +25,7 @@
public class ButtonGridLayout extends ViewGroup {
private final int mColumns = 3;
-
+
public ButtonGridLayout(Context context) {
super(context);
}
@@ -37,7 +37,7 @@
public ButtonGridLayout(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
-
+
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
int y = mPaddingTop;
@@ -49,7 +49,7 @@
final int childHeight = child0.getMeasuredHeight();
final int xOffset = (xInc - childWidth) / 2;
final int yOffset = (yInc - childHeight) / 2;
-
+
for (int row = 0; row < rows; row++) {
int x = mPaddingLeft;
for (int col = 0; col < mColumns; col++) {
@@ -58,8 +58,8 @@
break;
}
View child = getChildAt(cell);
- child.layout(x + xOffset, y + yOffset,
- x + xOffset + childWidth,
+ child.layout(x + xOffset, y + yOffset,
+ x + xOffset + childWidth,
y + yOffset + childHeight);
x += xInc;
}
@@ -68,14 +68,14 @@
}
private int getRows() {
- return (getChildCount() + mColumns - 1) / mColumns;
+ return (getChildCount() + mColumns - 1) / mColumns;
}
-
+
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int width = mPaddingLeft + mPaddingRight;
int height = mPaddingTop + mPaddingBottom;
-
+
// Measure the first child and get it's size
View child = getChildAt(0);
child.measure(MeasureSpec.UNSPECIFIED , MeasureSpec.UNSPECIFIED);
@@ -83,15 +83,21 @@
int childHeight = child.getMeasuredHeight();
// Make sure the other children are measured as well, to initialize
for (int i = 1; i < getChildCount(); i++) {
- getChildAt(0).measure(MeasureSpec.UNSPECIFIED , MeasureSpec.UNSPECIFIED);
+ getChildAt(i).measure(MeasureSpec.UNSPECIFIED , MeasureSpec.UNSPECIFIED);
}
// All cells are going to be the size of the first child
width += mColumns * childWidth;
- height += getRows() * childHeight;
-
- width = resolveSize(width, widthMeasureSpec);
- height = resolveSize(height, heightMeasureSpec);
- setMeasuredDimension(width, height);
+ final int finalWidth = resolveSize(width, widthMeasureSpec);
+
+ // The vertical padding between button must be the same as the
+ // horizontal one. The cumulative horizontal padding is the
+ // difference between 'width' and 'finalWidth'.
+ final int padding = (finalWidth - width) / mColumns;
+
+ height += getRows() * (childHeight + padding);
+
+ final int finalHeight = resolveSize(height, heightMeasureSpec);
+ setMeasuredDimension(finalWidth, finalHeight);
}
}
