diff options
| author | Sai Cheemalapati <saicheems@google.com> | 2014-06-20 18:35:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 02:04:45 +0000 |
| commit | 5a9fba8c08164a0329a5973fdc370550b8e92f86 (patch) | |
| tree | 779169bf43a6d16ed1f3d8b73583e9b6ee16fc5a | |
| parent | 6397c79f577ee90256118014840261cd23707803 (diff) | |
| parent | bf66e17262f968a91152a33139cd7cfb68dc1ccf (diff) | |
Merge "Update Emergency Dialer to match Dialer (4/5)."
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 4 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 7cd8c90aa..4509abc4a 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -43,9 +43,9 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import com.android.contacts.common.animation.AnimUtils; import com.android.contacts.common.util.ViewUtil; import com.android.contacts.common.widget.FloatingActionButtonController; +import com.android.phone.common.animation.AnimUtils; import java.util.List; diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java index 2674e23b5..b22141b95 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -32,8 +32,8 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.contacts.common.dialpad.DialpadKeyButton; -import com.android.contacts.common.dialpad.DialpadView; +import com.android.phone.common.dialpad.DialpadKeyButton; +import com.android.phone.common.dialpad.DialpadView; import java.util.HashMap; diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index a4705a000..8c7cc649b 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -35,7 +35,7 @@ import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; import android.widget.Toast; -import com.android.contacts.common.animation.AnimationListenerAdapter; +import com.android.phone.common.animation.AnimationListenerAdapter; import com.android.incallui.Call.State; /** |