Rename PRE_DIAL_WAIT to SELECT_PHONE_ACCOUNT

Bug: 20532435
Change-Id: Iae50b2ce15232a6010eb04895193b04c423ecc00

5 files changed, 10 insertions, 10 deletions

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index a12b985ee..4e9240543 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -55,7 +55,7 @@ public class Call {
         public static final int DISCONNECTING = 9;  /* A call is being ended. */
         public static final int DISCONNECTED = 10;  /* State after a call disconnects */
         public static final int CONFERENCED = 11;   /* Call part of a conference call */
-        public static final int PRE_DIAL_WAIT = 12; /* Waiting for user before outgoing call */
+        public static final int SELECT_PHONE_ACCOUNT = 12; /* Waiting for account selection */
         public static final int CONNECTING = 13;    /* Waiting for Telecomm broadcast to finish */
 
 
@@ -105,8 +105,8 @@ public class Call {
                     return "DISCONNECTED";
                 case CONFERENCED:
                     return "CONFERENCED";
-                case PRE_DIAL_WAIT:
-                    return "PRE_DIAL_WAIT";
+                case SELECT_PHONE_ACCOUNT:
+                    return "SELECT_PHONE_ACCOUNT";
                 case CONNECTING:
                     return "CONNECTING";
                 default:
@@ -321,8 +321,8 @@ public class Call {
                 return Call.State.NEW;
             case android.telecom.Call.STATE_CONNECTING:
                 return Call.State.CONNECTING;
-            case android.telecom.Call.STATE_PRE_DIAL_WAIT:
-                return Call.State.PRE_DIAL_WAIT;
+            case android.telecom.Call.STATE_SELECT_PHONE_ACCOUNT:
+                return Call.State.SELECT_PHONE_ACCOUNT;
             case android.telecom.Call.STATE_DIALING:
                 return Call.State.DIALING;
             case android.telecom.Call.STATE_RINGING:
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index d3d5b2388..d89fead9a 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -219,7 +219,7 @@ public class CallList {
      * A call that is waiting for {@link PhoneAccount} selection
      */
     public Call getWaitingForAccountCall() {
-        return getFirstCallWithState(Call.State.PRE_DIAL_WAIT);
+        return getFirstCallWithState(Call.State.SELECT_PHONE_ACCOUNT);
     }
 
     public Call getPendingOutgoingCall() {
diff --git a/InCallUI/src/com/android/incallui/CallUtils.java b/InCallUI/src/com/android/incallui/CallUtils.java
index 51913d4d2..79cf4c7e7 100644
--- a/InCallUI/src/com/android/incallui/CallUtils.java
+++ b/InCallUI/src/com/android/incallui/CallUtils.java
@@ -62,7 +62,7 @@ public class CallUtils {
         }
         final int state = call.getState();
         return Call.State.isDialing(state) || state == Call.State.CONNECTING
-                || state == Call.State.PRE_DIAL_WAIT;
+                || state == Call.State.SELECT_PHONE_ACCOUNT;
     }
 
     public static boolean isAudioCall(Call call) {
diff --git a/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java b/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java
index 3345c6bb0..f4e06a5fa 100644
--- a/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java
+++ b/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java
@@ -124,11 +124,11 @@ public class InCallPresenterTest extends InstrumentationTestCase {
     }
 
     /**
-     * Verifies that if there is a call in the PRE_DIAL_WAIT state, InCallActivity is displayed
+     * Verifies that if there is a call in the SELECT_PHONE_ACCOUNT state, InCallActivity is displayed
      * to display the account picker.
      */
     public void testOnCallListChange_noAccountProvidedForCallShowsUiForAccountPicker() {
-        mCallList.setHasCall(Call.State.PRE_DIAL_WAIT, true);
+        mCallList.setHasCall(Call.State.SELECT_PHONE_ACCOUNT, true);
         mInCallPresenter.onCallListChange(mCallList.getCallList());
 
         verify(mContext).startActivity(InCallPresenter.getInstance().getInCallIntent(false, false));
diff --git a/InCallUI/tests/src/com/android/incallui/MockCallListWrapper.java b/InCallUI/tests/src/com/android/incallui/MockCallListWrapper.java
index 5b574825c..369c4303f 100644
--- a/InCallUI/tests/src/com/android/incallui/MockCallListWrapper.java
+++ b/InCallUI/tests/src/com/android/incallui/MockCallListWrapper.java
@@ -66,7 +66,7 @@ public class MockCallListWrapper {
     }
 
     private static Call getMockCall(int state) {
-        return getMockCall(state, state != Call.State.PRE_DIAL_WAIT);
+        return getMockCall(state, state != Call.State.SELECT_PHONE_ACCOUNT);
     }
 
     private static Call getMockCall(int state, boolean hasAccountHandle) {