commit fd723cae1dc2de0f83ec14639d4431674dd3b82e
author Sai Cheemalapati <saicheems@google.com> Thu Jun 19 12:30:07 2014 -0700
committer Sai Cheemalapati <saicheems@google.com> Fri Jun 20 14:56:47 2014 -0700
tree 2cb93329244970f5c8fbaa314a4c602adb25a680
parent 801d88e55c59414cee422ca0433cec8b1c39d1e6

Update Emergency Dialer to match Dialer (3/7).

Emergency dialer style updated to match style in Dialer and
InCallUI.
Moved all dialpad resources to PhoneCommon.

Change-Id: I86747a58b196209a4543448ab939236eace7c52a

Android.mk

diff --git a/Android.mk b/Android.mk
index 206f004..c72c019 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,11 @@
 LOCAL_MODULE_TAGS := optional
 
 contacts_common_dir := ../ContactsCommon
+phone_common_dir := ../PhoneCommon
 incallui_dir := ../InCallUI
 
-src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res
+src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src $(phone_common_dir)/src
+res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res $(phone_common_dir)/res
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
@@ -15,11 +16,11 @@
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages com.android.contacts.common \
-    --extra-packages com.android.incallui
+    --extra-packages com.android.incallui \
+    --extra-packages com.android.phone.common
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    com.android.phone.shared \
     com.android.services.telephony.common \
     com.android.vcard \
     android-common \