diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-20 19:28:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 00:30:35 +0000 |
| commit | eb78a2651426392e653ae3e13b50914b98ccfdf7 (patch) | |
| tree | 52c655c75dd7f4e2f94ce18d529bd14bd9191d36 | |
| parent | 5a9fba8c08164a0329a5973fdc370550b8e92f86 (diff) | |
| parent | 3c57ccad4f6bf55335ac60e42f0ce7788047644b (diff) | |
Merge "Revert "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 4509abc4a..7cd8c90aa 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 b22141b95..2674e23b5 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.phone.common.dialpad.DialpadKeyButton; -import com.android.phone.common.dialpad.DialpadView; +import com.android.contacts.common.dialpad.DialpadKeyButton; +import com.android.contacts.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 8c7cc649b..a4705a000 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.phone.common.animation.AnimationListenerAdapter; +import com.android.contacts.common.animation.AnimationListenerAdapter; import com.android.incallui.Call.State; /** |