From 801d88e55c59414cee422ca0433cec8b1c39d1e6 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Fri, 20 Jun 2014 19:27:14 +0000 Subject: Revert "Update Emergency Dialer to match Dialer (2/5)." This reverts commit 9598b51d20cb27acb8dfd47abf2accb612cddb3c. Change-Id: I7c2d2b95740888af25b5b257572476b0f20900e3 --- Android.mk | 9 ++++----- src/com/android/dialer/DialtactsActivity.java | 2 +- src/com/android/dialer/dialpad/DialpadFragment.java | 4 ++-- src/com/android/dialer/list/SearchFragment.java | 2 +- src/com/android/dialer/widget/ActionBarController.java | 6 +++--- src/com/android/dialer/widget/SearchEditTextLayout.java | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Android.mk b/Android.mk index c72c0195e..206f00480 100644 --- a/Android.mk +++ b/Android.mk @@ -4,11 +4,10 @@ include $(CLEAR_VARS) 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 $(phone_common_dir)/src -res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res $(phone_common_dir)/res +src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src +res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) @@ -16,11 +15,11 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages com.android.contacts.common \ - --extra-packages com.android.incallui \ - --extra-packages com.android.phone.common + --extra-packages com.android.incallui 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 8e873c876..9fe636fad 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -65,6 +65,7 @@ import android.widget.Toast; 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; @@ -90,7 +91,6 @@ import com.android.dialer.widget.ActionBarController; 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 f54aa6c39..509bd528b 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -73,6 +73,8 @@ import com.android.contacts.common.CallUtil; 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; @@ -82,8 +84,6 @@ import com.android.dialer.SpecialCharSequenceMgr; 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 03d22429c..093d7c753 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -26,6 +26,7 @@ import android.widget.AbsListView; 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; @@ -34,7 +35,6 @@ import com.android.contacts.common.util.ViewUtil; 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 4f1e2e600..0e94df498 100644 --- a/src/com/android/dialer/widget/ActionBarController.java +++ b/src/com/android/dialer/widget/ActionBarController.java @@ -7,9 +7,9 @@ import android.animation.ValueAnimator.AnimatorUpdateListener; 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 class ActionBarController { 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 36e578953..3dcbc4bb1 100644 --- a/src/com/android/dialer/widget/SearchEditTextLayout.java +++ b/src/com/android/dialer/widget/SearchEditTextLayout.java @@ -27,8 +27,8 @@ import android.view.inputmethod.InputMethodManager; 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; -- cgit v1.2.3