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
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 \
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 9fe636f..8e873c8 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -65,7 +65,6 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.SubscriptionManager;
import com.android.contacts.common.activity.TransactionSafeActivity;
-import com.android.contacts.common.animation.AnimationListenerAdapter;
import com.android.contacts.common.dialog.ClearFrequentsDialog;
import com.android.contacts.common.dialog.SelectSubscriptionDialogFragment;
import com.android.contacts.common.interactions.ImportExportDialogFragment;
@@ -91,6 +90,7 @@
import com.android.dialer.widget.SearchEditTextLayout;
import com.android.dialer.widget.SearchEditTextLayout.OnBackButtonClickedListener;
import com.android.dialerbind.DatabaseHelperManager;
+import com.android.phone.common.animation.AnimationListenerAdapter;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 509bd52..f54aa6c 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -73,8 +73,6 @@
import com.android.contacts.common.GeoUtil;
import com.android.contacts.common.SubscriptionManager;
import com.android.contacts.common.dialog.SelectSubscriptionDialogFragment;
-import com.android.contacts.common.dialpad.DialpadKeyButton;
-import com.android.contacts.common.dialpad.DialpadView;
import com.android.contacts.common.util.PhoneNumberFormatter;
import com.android.contacts.common.util.StopWatch;
import com.android.dialer.NeededForReflection;
@@ -84,6 +82,8 @@
import com.android.dialer.util.DialerUtils;
import com.android.phone.common.CallLogAsync;
import com.android.phone.common.HapticFeedback;
+import com.android.phone.common.dialpad.DialpadKeyButton;
+import com.android.phone.common.dialpad.DialpadView;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index 093d7c7..03d2242 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -26,7 +26,6 @@
import android.widget.AbsListView.OnScrollListener;
import android.widget.ListView;
-import com.android.contacts.common.animation.AnimUtils;
import com.android.contacts.common.list.ContactEntryListAdapter;
import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
@@ -35,6 +34,7 @@
import com.android.dialer.DialtactsActivity;
import com.android.dialer.R;
import com.android.dialer.util.DialerUtils;
+import com.android.phone.common.animation.AnimUtils;
public class SearchFragment extends PhoneNumberPickerFragment {
diff --git a/src/com/android/dialer/widget/ActionBarController.java b/src/com/android/dialer/widget/ActionBarController.java
index 0e94df4..4f1e2e6 100644
--- a/src/com/android/dialer/widget/ActionBarController.java
+++ b/src/com/android/dialer/widget/ActionBarController.java
@@ -7,9 +7,9 @@
import android.os.Bundle;
import android.util.Log;
-import com.android.contacts.common.animation.AnimUtils;
-import com.android.contacts.common.animation.AnimUtils.AnimationCallback;
import com.android.dialer.DialtactsActivity;
+import com.android.phone.common.animation.AnimUtils;
+import com.android.phone.common.animation.AnimUtils.AnimationCallback;
/**
* Controls the various animated properties of the actionBar: showing/hiding, fading/revealing,
@@ -234,4 +234,4 @@
public boolean getIsActionBarSlidUp() {
return mIsActionBarSlidUp;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/dialer/widget/SearchEditTextLayout.java b/src/com/android/dialer/widget/SearchEditTextLayout.java
index 3dcbc4b..36e5789 100644
--- a/src/com/android/dialer/widget/SearchEditTextLayout.java
+++ b/src/com/android/dialer/widget/SearchEditTextLayout.java
@@ -27,8 +27,8 @@
import android.widget.EditText;
import android.widget.FrameLayout;
-import com.android.contacts.common.animation.AnimUtils;
import com.android.dialer.R;
+import com.android.phone.common.animation.AnimUtils;
public class SearchEditTextLayout extends FrameLayout {
private static final float EXPAND_MARGIN_FRACTION_START = 0.8f;