diff --git a/Android.mk b/Android.mk
index 17c748a..b12d32e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,26 +4,16 @@
 # for the 'other' dialer.
 include $(CLEAR_VARS)
 
-phone_common_dir := ../../apps/PhoneCommon
-
-src_dirs := src $(phone_common_dir)/src
-res_dirs := res $(phone_common_dir)/res
-
 LOCAL_JAVA_LIBRARIES := telephony-common voip-common
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.shared \
         com.android.services.telephony.common \
         guava \
 
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
         src/com/android/phone/EventLogTags.logtags \
         src/com/android/phone/INetworkQueryService.aidl \
         src/com/android/phone/INetworkQueryServiceCallback.aidl
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-
-LOCAL_AAPT_FLAGS := \
-    --auto-add-overlay \
-    --extra-packages com.android.phone.common
 
 LOCAL_PACKAGE_NAME := TeleService
 
diff --git a/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..bc947b2
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..2bbaead
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_2_wht.png b/res/drawable-ar-hdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..15583a0
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_3_wht.png b/res/drawable-ar-hdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..c8fd5b6
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_4_wht.png b/res/drawable-ar-hdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..2df8330
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_5_wht.png b/res/drawable-ar-hdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..b16701c
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_6_wht.png b/res/drawable-ar-hdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..823fa50
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_7_wht.png b/res/drawable-ar-hdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..6f5fbff
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_8_wht.png b/res/drawable-ar-hdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..d15c47f
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-ar-hdpi/dial_num_9_wht.png b/res/drawable-ar-hdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..7b28361
--- /dev/null
+++ b/res/drawable-ar-hdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..2339f89
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..7c80f05
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_2_wht.png b/res/drawable-ar-mdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..d4421a3
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_3_wht.png b/res/drawable-ar-mdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..10e8216
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_4_wht.png b/res/drawable-ar-mdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..2c7971f
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_5_wht.png b/res/drawable-ar-mdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..472ad7a
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_6_wht.png b/res/drawable-ar-mdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..682e76a
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_7_wht.png b/res/drawable-ar-mdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..9a1395f
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_8_wht.png b/res/drawable-ar-mdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..6ef31dd
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-ar-mdpi/dial_num_9_wht.png b/res/drawable-ar-mdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..e99e20a
--- /dev/null
+++ b/res/drawable-ar-mdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..8924fc8
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..667a7c5
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_2_wht.png b/res/drawable-ar-xhdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..1b39dbe
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_3_wht.png b/res/drawable-ar-xhdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..2cf7577
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_4_wht.png b/res/drawable-ar-xhdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..1816e60
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_5_wht.png b/res/drawable-ar-xhdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..b846a14
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_6_wht.png b/res/drawable-ar-xhdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..5768e87
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_7_wht.png b/res/drawable-ar-xhdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..98667a2
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_8_wht.png b/res/drawable-ar-xhdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..dc71242
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-ar-xhdpi/dial_num_9_wht.png b/res/drawable-ar-xhdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..4917ee0
--- /dev/null
+++ b/res/drawable-ar-xhdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..bc947b2
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..2bbaead
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_2_wht.png b/res/drawable-fa-hdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..15583a0
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_3_wht.png b/res/drawable-fa-hdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..c8fd5b6
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_4_wht.png b/res/drawable-fa-hdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..4d6b4ea
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_5_wht.png b/res/drawable-fa-hdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..43b2886
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_6_wht.png b/res/drawable-fa-hdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..7db627e
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_7_wht.png b/res/drawable-fa-hdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..6f5fbff
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_8_wht.png b/res/drawable-fa-hdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..d15c47f
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-fa-hdpi/dial_num_9_wht.png b/res/drawable-fa-hdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..7b28361
--- /dev/null
+++ b/res/drawable-fa-hdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..2339f89
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..7c80f05
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_2_wht.png b/res/drawable-fa-mdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..d4421a3
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_3_wht.png b/res/drawable-fa-mdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..10e8216
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_4_wht.png b/res/drawable-fa-mdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..de5c7b2
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_5_wht.png b/res/drawable-fa-mdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..ba461d7
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_6_wht.png b/res/drawable-fa-mdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..ec41f38
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_7_wht.png b/res/drawable-fa-mdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..9a1395f
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_8_wht.png b/res/drawable-fa-mdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..6ef31dd
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-fa-mdpi/dial_num_9_wht.png b/res/drawable-fa-mdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..e99e20a
--- /dev/null
+++ b/res/drawable-fa-mdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..8924fc8
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..667a7c5
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_2_wht.png b/res/drawable-fa-xhdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..1b39dbe
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_3_wht.png b/res/drawable-fa-xhdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..2cf7577
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_4_wht.png b/res/drawable-fa-xhdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..6e0a5a9
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_5_wht.png b/res/drawable-fa-xhdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..f496906
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_6_wht.png b/res/drawable-fa-xhdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..e75b83e
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_7_wht.png b/res/drawable-fa-xhdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..98667a2
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_8_wht.png b/res/drawable-fa-xhdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..dc71242
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-fa-xhdpi/dial_num_9_wht.png b/res/drawable-fa-xhdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..4917ee0
--- /dev/null
+++ b/res/drawable-fa-xhdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_call_pressed.png b/res/drawable-hdpi/btn_call_pressed.png
new file mode 100644
index 0000000..d6e47f4
--- /dev/null
+++ b/res/drawable-hdpi/btn_call_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..9df3b1e
--- /dev/null
+++ b/res/drawable-hdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-hdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..69849ec
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-hdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..af7ec42
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_1_no_vm_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
new file mode 100644
index 0000000..2ae20ab
--- /dev/null
+++ 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
new file mode 100644
index 0000000..991d5f3
--- /dev/null
+++ 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
new file mode 100644
index 0000000..7aad3ef
--- /dev/null
+++ 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
new file mode 100644
index 0000000..42a1d0b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b03e019
--- /dev/null
+++ 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
new file mode 100644
index 0000000..8b72fff
--- /dev/null
+++ 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
new file mode 100644
index 0000000..822f21a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2ee944b
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/fab_ic_call.png b/res/drawable-hdpi/fab_ic_call.png
deleted file mode 100644
index 7bf83fa..0000000
--- a/res/drawable-hdpi/fab_ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_teal_background.png
deleted file mode 100644
index e2f01e8..0000000
--- a/res/drawable-hdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_call_pressed.png b/res/drawable-mdpi/btn_call_pressed.png
new file mode 100644
index 0000000..9d38da5
--- /dev/null
+++ b/res/drawable-mdpi/btn_call_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..90cd07c
--- /dev/null
+++ b/res/drawable-mdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-mdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..1d8b0e3
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-mdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..e253724
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_1_no_vm_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
new file mode 100644
index 0000000..e311f4f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..f07324a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..cd8d33c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a9f27dc
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2bdf08e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..6c1c599
--- /dev/null
+++ 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
new file mode 100644
index 0000000..db0694c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..692fdb0
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/fab_ic_call.png b/res/drawable-mdpi/fab_ic_call.png
deleted file mode 100644
index 790f935..0000000
--- a/res/drawable-mdpi/fab_ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_teal_background.png
deleted file mode 100644
index c95d124..0000000
--- a/res/drawable-mdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_call_pressed.png b/res/drawable-xhdpi/btn_call_pressed.png
new file mode 100644
index 0000000..48e7eba
--- /dev/null
+++ b/res/drawable-xhdpi/btn_call_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_background_texture.png b/res/drawable-xhdpi/dial_background_texture.png
new file mode 100644
index 0000000..02aacc8
--- /dev/null
+++ b/res/drawable-xhdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-xhdpi/dial_num_0_no_plus_wht.png
new file mode 100644
index 0000000..11ca993
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_0_no_plus_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..8d2ac70
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_2_wht.png b/res/drawable-xhdpi/dial_num_2_wht.png
new file mode 100644
index 0000000..12c4ab9
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_3_wht.png b/res/drawable-xhdpi/dial_num_3_wht.png
new file mode 100644
index 0000000..4353e8a
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_4_wht.png b/res/drawable-xhdpi/dial_num_4_wht.png
new file mode 100644
index 0000000..ccee5cc
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_5_wht.png b/res/drawable-xhdpi/dial_num_5_wht.png
new file mode 100644
index 0000000..f27f153
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_6_wht.png b/res/drawable-xhdpi/dial_num_6_wht.png
new file mode 100644
index 0000000..8966d13
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_7_wht.png b/res/drawable-xhdpi/dial_num_7_wht.png
new file mode 100644
index 0000000..b018810
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_8_wht.png b/res/drawable-xhdpi/dial_num_8_wht.png
new file mode 100644
index 0000000..7c7b4f8
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_9_wht.png b/res/drawable-xhdpi/dial_num_9_wht.png
new file mode 100644
index 0000000..23984f0
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/fab_ic_call.png b/res/drawable-xhdpi/fab_ic_call.png
deleted file mode 100644
index 6bd53f5..0000000
--- a/res/drawable-xhdpi/fab_ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_teal_background.png
deleted file mode 100644
index f94f759..0000000
--- a/res/drawable-xhdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_ic_call.png b/res/drawable-xxhdpi/fab_ic_call.png
deleted file mode 100644
index 6866fa4..0000000
--- a/res/drawable-xxhdpi/fab_ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_teal_background.png
deleted file mode 100644
index cc0ba27..0000000
--- a/res/drawable-xxhdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/background_dial_holo_dark.xml
similarity index 69%
copy from res/drawable/floating_action_button.xml
copy to res/drawable/background_dial_holo_dark.xml
index d518ddd..e06507f 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/background_dial_holo_dark.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -15,7 +14,9 @@
      limitations under the License.
 -->
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/dialer_accent_color">
-    <item android:drawable="@drawable/fab_teal_background" />
-</ripple>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:startColor="#ff020709"
+            android:endColor="#ff0a242d"
+            android:angle="270" />
+</shape>
diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml
new file mode 100644
index 0000000..abce983
--- /dev/null
+++ b/res/drawable/btn_call.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+<!-- Background resource for call button in the various dialpads.
+     Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+
+    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" />
+    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" />
+    <item android:state_focused="true"                                                             android:drawable="@drawable/list_focused_holo" />
+    <item                                                                                          android:drawable="@android:color/transparent" />
+</selector>
+
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/dialpad_background.xml
similarity index 71%
rename from res/drawable/floating_action_button.xml
rename to res/drawable/dialpad_background.xml
index d518ddd..0e31f5e 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/dialpad_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,7 +14,6 @@
      limitations under the License.
 -->
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/dialer_accent_color">
-    <item android:drawable="@drawable/fab_teal_background" />
-</ripple>
+<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
new file mode 100644
index 0000000..45ce513
--- /dev/null
+++ b/res/layout/dialpad.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 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.
+-->
+
+<!-- The grid of buttons used in the onscreen DTMF dialpad;
+     see dtmf_twelve_key_dialer_view.xml. -->
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialpad"
+    android:layout_width="match_parent"
+    android:layout_height="0px"
+    android:layout_weight="@integer/dialpad_layout_weight_dialpad"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="@dimen/dialpad_vertical_margin"
+    android:paddingStart="5dip"
+    android:paddingEnd="5dip"
+    android:paddingBottom="10dip"
+    android:background="@drawable/dialpad_background"
+    android:layoutDirection="ltr">
+
+    <TableRow
+         android:layout_height="0px"
+         android:layout_weight="1">
+        <ImageButton android:id="@+id/one" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_1_no_vm_wht"
+            android:contentDescription="@string/description_image_button_one" />
+        <ImageButton android:id="@+id/two" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_2_wht"
+            android:contentDescription="@string/description_image_button_two" />
+        <ImageButton android:id="@+id/three" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_3_wht"
+            android:contentDescription="@string/description_image_button_three" />
+    </TableRow>
+
+    <TableRow
+         android:layout_height="0px"
+         android:layout_weight="1">
+        <ImageButton android:id="@+id/four" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_4_wht"
+            android:contentDescription="@string/description_image_button_four" />
+        <ImageButton android:id="@+id/five" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_5_wht"
+            android:contentDescription="@string/description_image_button_five" />
+        <ImageButton android:id="@+id/six" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_6_wht"
+            android:contentDescription="@string/description_image_button_six" />
+    </TableRow>
+
+    <TableRow
+         android:layout_height="0px"
+         android:layout_weight="1">
+        <ImageButton android:id="@+id/seven" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_7_wht"
+            android:contentDescription="@string/description_image_button_seven" />
+        <ImageButton android:id="@+id/eight" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_8_wht"
+            android:contentDescription="@string/description_image_button_eight" />
+        <ImageButton android:id="@+id/nine" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_9_wht"
+            android:contentDescription="@string/description_image_button_nine" />
+    </TableRow>
+
+    <TableRow
+         android:layout_height="0px"
+         android:layout_weight="1">
+        <ImageButton android:id="@+id/star" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_star_wht"
+            android:contentDescription="@string/description_image_button_star" />
+        <ImageButton android:id="@+id/zero" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_0_no_plus_wht"
+            android:contentDescription="@string/description_image_button_zero" />
+        <ImageButton android:id="@+id/pound" style="@style/DialpadButtonStyle"
+            android:src="@drawable/dial_num_pound_wht"
+            android:contentDescription="@string/description_image_button_pound" />
+    </TableRow>
+</TableLayout>
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 5c721c5..d98631e 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2006 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.
@@ -15,24 +15,76 @@
 -->
 
 <!-- Layout for the emergency dialer; see EmergencyDialer.java. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    <include layout="@layout/dialpad_view" />
-    <FrameLayout
-        android:id="@+id/floating_action_button_container"
-        android:layout_width="@dimen/floating_action_button_width"
-        android:layout_height="@dimen/floating_action_button_height"
-        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
-        android:layout_gravity="center_horizontal|bottom" >
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_marginStart="@dimen/dialpad_horizontal_margin"
+    android:layout_marginEnd="@dimen/dialpad_horizontal_margin">
+
+    <!-- Text field above the keypad where the digits are displayed -->
+    <LinearLayout
+        android:id="@+id/digits_container"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="@integer/dialpad_layout_weight_digits"
+        android:layout_marginTop="@dimen/dialpad_vertical_margin"
+        android:gravity="center"
+        android:background="@drawable/dialpad_background" >
+
+        <EditText
+            android:id="@+id/digits"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:scrollHorizontally="true"
+            android:textAppearance="@style/DialtactsDigitsTextAppearance"
+            android:focusableInTouchMode="false"
+            android:nextFocusRight="@+id/deleteButton"
+            android:background="@android:color/transparent" />
 
         <ImageButton
-            android:id="@+id/floating_action_button"
+            android:id="@+id/deleteButton"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:state_enabled="false"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/description_delete_button"
+            android:src="@drawable/ic_dial_action_delete" />
+    </LinearLayout>
+
+    <!-- Keypad section -->
+    <include layout="@layout/dialpad" />
+
+    <View
+       android:layout_width="match_parent"
+       android:layout_height="@dimen/dialpad_vertical_margin"
+       android:background="#66000000"/>
+
+    <!-- In usual dialpad we set some padding between this button and the
+         left/right edges. Here, we don't do that just for simplicitly. -->
+    <FrameLayout
+        android:id="@+id/dialButtonContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/dialpad_background">
+
+        <ImageButton
+            android:id="@+id/dialButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/floating_action_button"
+            android:layout_gravity="center"
+            android:state_enabled="false"
+            android:background="@drawable/btn_call"
             android:contentDescription="@string/description_dial_button"
-            android:src="@drawable/fab_ic_call"/>
+            android:src="@drawable/ic_dial_action_call" />
+
     </FrameLayout>
-</FrameLayout>
+
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c493a11..5eab9e3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -50,6 +50,4 @@
     <color name="setting_primary_color">#4d4c4c</color>
     <!-- Color for the setting description text. -->
     <color name="setting_secondary_color">#989898</color>
-    <color name="dialer_dialpad_touch_tint">#331dc7db</color>
-    <color name="dialer_accent_color">#eeff41</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 689ec84..b62026b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -220,6 +220,14 @@
         <item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
+    <style name="DialpadButtonStyle">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:soundEffectsEnabled">false</item>
+    </style>
+
     <style name="ContactsActionBarStyle"
            parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
         <item name="android:background">@color/people_app_theme_color</item>
@@ -247,15 +255,15 @@
         <item name="android:src">@drawable/ic_menu_overflow_lt</item>
     </style>
 
-    <style name="EmergencyDialerTheme" parent="@android:style/Theme.Material.Light">
-        <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item>
-    </style>
-
     <style name="SimImportTheme"
            parent="@android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
     </style>
 
+    <style name="EmergencyDialerTheme" parent="@android:style/Theme.Holo">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
     <style name="OutgoingCallBroadcasterTheme" parent="@android:style/Theme.Holo.NoActionBar">
         <item name="android:windowBackground">@android:color/black</item>
 
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 8d4521f..772cce9 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -44,7 +44,6 @@
 import android.widget.EditText;
 
 import com.android.phone.common.HapticFeedback;
-import com.android.phone.common.util.ViewUtil;
 
 
 /**
@@ -193,7 +192,7 @@
         mDelete.setOnClickListener(this);
         mDelete.setOnLongClickListener(this);
 
-        mDialButton = findViewById(R.id.floating_action_button);
+        mDialButton = findViewById(R.id.dialButton);
 
         // Check whether we should show the onscreen "Dial" button and co.
         Resources res = getResources();
@@ -202,8 +201,6 @@
         } else {
             mDialButton.setVisibility(View.GONE);
         }
-        View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
-        ViewUtil.setupFloatingActionButton(floatingActionButtonContainer, getResources());
 
         if (icicle != null) {
             super.onRestoreInstanceState(icicle);
@@ -408,7 +405,7 @@
                 keyPressed(KeyEvent.KEYCODE_DEL);
                 return;
             }
-            case R.id.floating_action_button: {
+            case R.id.dialButton: {
                 mHaptic.vibrate();  // Vibrate here too, just like we do for the regular keys
                 placeCall();
                 return;
@@ -635,6 +632,7 @@
     private void updateDialAndDeleteButtonStateEnabledAttr() {
         final boolean notEmpty = mDigits.length() != 0;
 
+        mDialButton.setEnabled(notEmpty);
         mDelete.setEnabled(notEmpty);
     }
 }