Merge "Update dialpad screen design"
diff --git a/res/drawable-hdpi/btn_dial_pressed.9.png b/res/drawable-hdpi/btn_dial_pressed.9.png
deleted file mode 100644
index 10e2eec..0000000
--- a/res/drawable-hdpi/btn_dial_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_dial_pressed.png b/res/drawable-hdpi/btn_dial_pressed.png
new file mode 100644
index 0000000..5ae0b16
--- /dev/null
+++ b/res/drawable-hdpi/btn_dial_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_background_texture.png b/res/drawable-hdpi/dial_background_texture.png
new file mode 100644
index 0000000..177fad8
--- /dev/null
+++ b/res/drawable-hdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_0_wht.png b/res/drawable-hdpi/dial_num_0_wht.png
index 2b194c8..ac70558 100644
--- a/res/drawable-hdpi/dial_num_0_wht.png
+++ b/res/drawable-hdpi/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_1_wht.png b/res/drawable-hdpi/dial_num_1_wht.png
new file mode 100644
index 0000000..fc05ec7
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_1_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_2_wht.png b/res/drawable-hdpi/dial_num_2_wht.png
index 944d5d8..cc81d4c 100644
--- a/res/drawable-hdpi/dial_num_2_wht.png
+++ b/res/drawable-hdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_3_wht.png b/res/drawable-hdpi/dial_num_3_wht.png
index 9ed2bb5..984c60a 100644
--- a/res/drawable-hdpi/dial_num_3_wht.png
+++ b/res/drawable-hdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_4_wht.png b/res/drawable-hdpi/dial_num_4_wht.png
index 92b1ca6..aa03211 100644
--- a/res/drawable-hdpi/dial_num_4_wht.png
+++ b/res/drawable-hdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_5_wht.png b/res/drawable-hdpi/dial_num_5_wht.png
index 21f1ce6..16bee92 100644
--- a/res/drawable-hdpi/dial_num_5_wht.png
+++ b/res/drawable-hdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_6_wht.png b/res/drawable-hdpi/dial_num_6_wht.png
index b794ffb..381ee78 100644
--- a/res/drawable-hdpi/dial_num_6_wht.png
+++ b/res/drawable-hdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_7_wht.png b/res/drawable-hdpi/dial_num_7_wht.png
index c3cc401..4e54df0 100644
--- a/res/drawable-hdpi/dial_num_7_wht.png
+++ b/res/drawable-hdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_8_wht.png b/res/drawable-hdpi/dial_num_8_wht.png
index c199f96..1010a59 100644
--- a/res/drawable-hdpi/dial_num_8_wht.png
+++ b/res/drawable-hdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_9_wht.png b/res/drawable-hdpi/dial_num_9_wht.png
index 07251e5..6cba58a 100644
--- a/res/drawable-hdpi/dial_num_9_wht.png
+++ b/res/drawable-hdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_pound_wht.png b/res/drawable-hdpi/dial_num_pound_wht.png
index 0e178dc..de3214c 100644
--- a/res/drawable-hdpi/dial_num_pound_wht.png
+++ b/res/drawable-hdpi/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_star_wht.png b/res/drawable-hdpi/dial_num_star_wht.png
index 4271556..96297de 100644
--- a/res/drawable-hdpi/dial_num_star_wht.png
+++ b/res/drawable-hdpi/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_phone.png b/res/drawable-hdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..0943ce5
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_dial_pressed.9.png b/res/drawable-mdpi/btn_dial_pressed.9.png
deleted file mode 100644
index 6fd3e44..0000000
--- a/res/drawable-mdpi/btn_dial_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_dial_pressed.png b/res/drawable-mdpi/btn_dial_pressed.png
new file mode 100644
index 0000000..a39a2ba
--- /dev/null
+++ b/res/drawable-mdpi/btn_dial_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_background_texture.png b/res/drawable-mdpi/dial_background_texture.png
new file mode 100644
index 0000000..ea27fd2
--- /dev/null
+++ b/res/drawable-mdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_0_wht.png b/res/drawable-mdpi/dial_num_0_wht.png
index 81a2e46..d5aae8b 100644
--- a/res/drawable-mdpi/dial_num_0_wht.png
+++ b/res/drawable-mdpi/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_1_wht.png b/res/drawable-mdpi/dial_num_1_wht.png
new file mode 100644
index 0000000..57ec236
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_1_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_2_wht.png b/res/drawable-mdpi/dial_num_2_wht.png
index 129224f..eec9d06 100644
--- a/res/drawable-mdpi/dial_num_2_wht.png
+++ b/res/drawable-mdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_3_wht.png b/res/drawable-mdpi/dial_num_3_wht.png
index 7828567..588e1c0 100644
--- a/res/drawable-mdpi/dial_num_3_wht.png
+++ b/res/drawable-mdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_4_wht.png b/res/drawable-mdpi/dial_num_4_wht.png
index 730a4d8..ee6c5cf 100644
--- a/res/drawable-mdpi/dial_num_4_wht.png
+++ b/res/drawable-mdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_5_wht.png b/res/drawable-mdpi/dial_num_5_wht.png
index 8d5a6b3..825b47e 100644
--- a/res/drawable-mdpi/dial_num_5_wht.png
+++ b/res/drawable-mdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_6_wht.png b/res/drawable-mdpi/dial_num_6_wht.png
index d2bc13d..db286cb 100644
--- a/res/drawable-mdpi/dial_num_6_wht.png
+++ b/res/drawable-mdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_7_wht.png b/res/drawable-mdpi/dial_num_7_wht.png
index 41c29ae..af6492b 100644
--- a/res/drawable-mdpi/dial_num_7_wht.png
+++ b/res/drawable-mdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_8_wht.png b/res/drawable-mdpi/dial_num_8_wht.png
index b070426..cd05aeb 100644
--- a/res/drawable-mdpi/dial_num_8_wht.png
+++ b/res/drawable-mdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_9_wht.png b/res/drawable-mdpi/dial_num_9_wht.png
index 9392aae..d82e119 100644
--- a/res/drawable-mdpi/dial_num_9_wht.png
+++ b/res/drawable-mdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_pound_wht.png b/res/drawable-mdpi/dial_num_pound_wht.png
index c9a1535..d1b2101 100644
--- a/res/drawable-mdpi/dial_num_pound_wht.png
+++ b/res/drawable-mdpi/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_star_wht.png b/res/drawable-mdpi/dial_num_star_wht.png
index 4030646..dbcb782 100644
--- a/res/drawable-mdpi/dial_num_star_wht.png
+++ b/res/drawable-mdpi/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_phone.png b/res/drawable-mdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..724f94a
--- /dev/null
+++ b/res/drawable-mdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/drawable/btn_dial.xml b/res/drawable/btn_dial.xml
index 22a785a..7559924 100644
--- a/res/drawable/btn_dial.xml
+++ b/res/drawable/btn_dial.xml
@@ -22,6 +22,7 @@
         android:drawable="@drawable/btn_dial_pressed" />
     <item android:state_focused="true"
         android:drawable="@drawable/btn_dial_selected" />
-    <item
-        android:drawable="@drawable/btn_dial_normal" />
+
+    <item android:state_focused="true"
+        android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/dial_num_0.xml b/res/drawable/dial_num_0.xml
index cd4d727..cc82dcf 100644
--- a/res/drawable/dial_num_0.xml
+++ b/res/drawable/dial_num_0.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_0_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_0_blk" />
+        android:drawable="@drawable/dial_num_0_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_0_wht" />
 </selector>
diff --git a/res/drawable/dial_num_1.xml b/res/drawable/dial_num_1.xml
new file mode 100644
index 0000000..a102ac8
--- /dev/null
+++ b/res/drawable/dial_num_1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     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.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- <item android:state_pressed="true"
+        android:drawable="@drawable/dial_num_1" />
+    <item android:state_focused="true"
+        android:drawable="@drawable/dial_num_1" /> -->
+    <item
+        android:drawable="@drawable/dial_num_1_wht" />
+</selector>
diff --git a/res/drawable/dial_num_1_no_vm.xml b/res/drawable/dial_num_1_no_vm.xml
index daa4613..201c4d2 100644
--- a/res/drawable/dial_num_1_no_vm.xml
+++ b/res/drawable/dial_num_1_no_vm.xml
@@ -22,4 +22,3 @@
     <item
         android:drawable="@drawable/dial_num_1_no_vm_wht" />
 </selector>
-
diff --git a/res/drawable/dial_num_2.xml b/res/drawable/dial_num_2.xml
index 1a087f6..57c3ce6 100644
--- a/res/drawable/dial_num_2.xml
+++ b/res/drawable/dial_num_2.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_2_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_2_blk" />
+        android:drawable="@drawable/dial_num_2_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_2_wht" />
 </selector>
diff --git a/res/drawable/dial_num_3.xml b/res/drawable/dial_num_3.xml
index dda794a..e2b4b40 100644
--- a/res/drawable/dial_num_3.xml
+++ b/res/drawable/dial_num_3.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_3_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_3_blk" />
+        android:drawable="@drawable/dial_num_3_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_3_wht" />
 </selector>
diff --git a/res/drawable/dial_num_4.xml b/res/drawable/dial_num_4.xml
index 511e58b..814b16a 100644
--- a/res/drawable/dial_num_4.xml
+++ b/res/drawable/dial_num_4.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_4_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_4_blk" />
+        android:drawable="@drawable/dial_num_4_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_4_wht" />
 </selector>
diff --git a/res/drawable/dial_num_5.xml b/res/drawable/dial_num_5.xml
index a857bc7..e9cc3ad 100644
--- a/res/drawable/dial_num_5.xml
+++ b/res/drawable/dial_num_5.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_5_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_5_blk" />
+        android:drawable="@drawable/dial_num_5_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_5_wht" />
 </selector>
diff --git a/res/drawable/dial_num_6.xml b/res/drawable/dial_num_6.xml
index b494458..8f78add 100644
--- a/res/drawable/dial_num_6.xml
+++ b/res/drawable/dial_num_6.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_6_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_6_blk" />
+        android:drawable="@drawable/dial_num_6_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_6_wht" />
 </selector>
diff --git a/res/drawable/dial_num_7.xml b/res/drawable/dial_num_7.xml
index a22c894..1d255a2 100644
--- a/res/drawable/dial_num_7.xml
+++ b/res/drawable/dial_num_7.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_7_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_7_blk" />
+        android:drawable="@drawable/dial_num_7_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_7_wht" />
 </selector>
diff --git a/res/drawable/dial_num_8.xml b/res/drawable/dial_num_8.xml
index 8ac7930..2b7eb11 100644
--- a/res/drawable/dial_num_8.xml
+++ b/res/drawable/dial_num_8.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_8_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_8_blk" />
+        android:drawable="@drawable/dial_num_8_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_8_wht" />
 </selector>
diff --git a/res/drawable/dial_num_9.xml b/res/drawable/dial_num_9.xml
index d0b7fd9..ae019ed 100644
--- a/res/drawable/dial_num_9.xml
+++ b/res/drawable/dial_num_9.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_9_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_9_blk" />
+        android:drawable="@drawable/dial_num_9_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_9_wht" />
 </selector>
diff --git a/res/drawable/dial_num_pound.xml b/res/drawable/dial_num_pound.xml
index 609d748..c9c1e6f 100644
--- a/res/drawable/dial_num_pound.xml
+++ b/res/drawable/dial_num_pound.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_pound_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_pound_blk" />
+        android:drawable="@drawable/dial_num_pound_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_pound_wht" />
 </selector>
diff --git a/res/drawable/dial_num_star.xml b/res/drawable/dial_num_star.xml
index 3b3304a..af3c20e 100644
--- a/res/drawable/dial_num_star.xml
+++ b/res/drawable/dial_num_star.xml
@@ -15,10 +15,10 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <!-- <item android:state_pressed="true"
         android:drawable="@drawable/dial_num_star_blk" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_star_blk" />
+        android:drawable="@drawable/dial_num_star_blk" /> -->
     <item
         android:drawable="@drawable/dial_num_star_wht" />
 </selector>
diff --git a/res/drawable/dialpad_background.xml b/res/drawable/dialpad_background.xml
new file mode 100644
index 0000000..0e31f5e
--- /dev/null
+++ b/res/drawable/dialpad_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     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.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/dial_background_texture"
+    android:tileMode="repeat" />
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 4533f9d..e9a95ee 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -21,12 +21,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
-    android:layout_marginTop="10dip"
+    android:layout_marginTop="4dip"
+    android:background="@drawable/dialpad_background"
     android:layout_weight="1">
 
     <TableRow>
         <ImageButton android:id="@+id/one" style="@style/DialtactsDialpadButtonStyle"
-            android:src="@drawable/dial_num_1_no_vm"
+            android:src="@drawable/dial_num_1"
             android:contentDescription="@string/description_image_button_one" />
         <ImageButton android:id="@+id/two" style="@style/DialtactsDialpadButtonStyle"
             android:src="@drawable/dial_num_2"
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
index 8831dad..26a2c04 100644
--- a/res/layout/dialpad_additional_buttons.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -20,8 +20,10 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/dialpad_additional_buttons_height"
     android:layout_gravity="center_horizontal"
-    android:layout_marginBottom="8dip"
+    android:layout_marginTop="4dip"
+    android:layout_marginBottom="4dip"
     android:layout_weight="0.25"
+    android:background="@drawable/dialpad_background"
     android:orientation="horizontal">
 
     <!-- Onscreen "Search button -->
@@ -31,7 +33,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@null"
+        android:background="@drawable/btn_dial"
         android:contentDescription="@string/description_search_button"
         android:src="@drawable/ic_dial_action_search"/>
 
@@ -44,7 +46,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@null"
+        android:background="@drawable/btn_dial"
         android:contentDescription="@string/description_dial_button"
         android:src="@drawable/ic_dial_action_call" />
 
@@ -55,7 +57,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@null"
+        android:background="@drawable/btn_dial"
         android:contentDescription="@string/description_delete_button"
         android:src="@drawable/ic_dial_action_delete" />
 </LinearLayout>
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index b91c27a..aee2c25 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -19,8 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@android:color/black"
->
+    android:layout_marginLeft="8dip"
+    android:layout_marginRight="8dip" >
 
     <!-- Text field above the keypad where the digits are displayed.
          It's type is set to NULL (to disable the IME keyboard) in the
@@ -31,15 +31,16 @@
     <EditText android:id="@+id/digits"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dialpad_digits_height"
-        android:layout_marginTop="10dip"
+        android:layout_marginTop="4dip"
         android:gravity="center"
         android:textAppearance="@style/DialtactsDigitsTextAppearance"
-        android:textColor="?android:attr/textColorPrimaryInverse" />
+        android:background="@drawable/dialpad_background"
+        android:textColor="?android:attr/textColorPrimary" />
 
     <!-- Keypad section -->
     <include layout="@layout/dialpad" />
 
-    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
+    <!-- Horizontal row of buttons (Search + DialButton + Delete.) -->
     <include layout="@layout/dialpad_additional_buttons" />
 
     <!-- "Dialpad chooser" UI, shown only when the user brings up the
diff --git a/res/mipmap-xhdpi/ic_launcher_contacts.png b/res/mipmap-xhdpi/ic_launcher_contacts.png
new file mode 100644
index 0000000..ca3aa63
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_folder_live_contacts.png b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts.png
new file mode 100644
index 0000000..99bb9f8
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_phone.png b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_phone.png
new file mode 100644
index 0000000..fd416b8
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_phone.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_starred.png b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_starred.png
new file mode 100644
index 0000000..ff9e326
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_folder_live_contacts_starred.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_phone.png b/res/mipmap-xhdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..6a454da
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_shortcut_contact.png b/res/mipmap-xhdpi/ic_launcher_shortcut_contact.png
new file mode 100644
index 0000000..94c7da5
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_shortcut_contact.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_shortcut_directdial.png b/res/mipmap-xhdpi/ic_launcher_shortcut_directdial.png
new file mode 100644
index 0000000..42f8f0a
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_shortcut_directdial.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_shortcut_directmessage.png b/res/mipmap-xhdpi/ic_launcher_shortcut_directmessage.png
new file mode 100644
index 0000000..babcc02
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_shortcut_directmessage.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2add5e2..6e88440 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -691,6 +691,7 @@
     <!-- String describing the Search ImageButton
 
          Used by AccessibilityService to announce the purpose of the button.
+         [CHAR LIMIT=NONE]
     -->
     <string name="description_search_button">search</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 801cc51..5da3ac5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <style name="DialtactsTheme" parent="android:Theme.Holo.Light.SplitActionBarWhenNarrow">
+    <style name="DialtactsTheme" parent="android:Theme.Holo.SplitActionBarWhenNarrow">
         <item name="android:windowContentOverlay">@null</item>
         <item name="activated_background">@drawable/list_item_activated_background</item>
         <item name="section_header_background">@drawable/list_title_holo</item>
@@ -313,7 +313,7 @@
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_height">@dimen/dialpad_button_height</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:background">@null</item>
+        <item name="android:background">@drawable/btn_dial</item>
         <item name="android:soundEffectsEnabled">false</item>
     </style>
 </resources>