diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-20 19:27:14 +0000 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2014-06-20 19:27:14 +0000 |
| commit | 801d88e55c59414cee422ca0433cec8b1c39d1e6 (patch) | |
| tree | f9c8c3c56a7d4d23d3dab712139913d34ed3ac89 /src/com/android/dialer/widget | |
| parent | 9598b51d20cb27acb8dfd47abf2accb612cddb3c (diff) | |
| download | packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.tar.gz packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.tar.bz2 packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.zip | |
Revert "Update Emergency Dialer to match Dialer (2/5)."
This reverts commit 9598b51d20cb27acb8dfd47abf2accb612cddb3c.
Change-Id: I7c2d2b95740888af25b5b257572476b0f20900e3
Diffstat (limited to 'src/com/android/dialer/widget')
| -rw-r--r-- | src/com/android/dialer/widget/ActionBarController.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/widget/SearchEditTextLayout.java | 2 |
2 files changed, 4 insertions, 4 deletions
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; |