diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-04-23 14:49:41 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2015-05-08 12:04:59 -0700 |
| commit | 545b5acda593e85e3afd22fed2de89f0c1ed08b4 (patch) | |
| tree | dc6aef2bbb6107c718a1c8be25f262d0b4d96d79 /InCallUI | |
| parent | 54587783b58b50b395bc6a24a6992698acf6bd21 (diff) | |
DO NOT MERGE Rename PRE_DIAL_WAIT to SELECT_PHONE_ACCOUNT
Bug: 20532435
Change-Id: Iae50b2ce15232a6010eb04895193b04c423ecc00
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 10 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallUtils.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 4324a5766..605d1a182 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -50,7 +50,7 @@ public final 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 */ @@ -100,8 +100,8 @@ public final 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: @@ -305,8 +305,8 @@ public final 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 f7a9e5cc3..3eb757b42 100644 --- a/InCallUI/src/com/android/incallui/CallList.java +++ b/InCallUI/src/com/android/incallui/CallList.java @@ -230,7 +230,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 53cc66a68..0e0c4c6f5 100644 --- a/InCallUI/src/com/android/incallui/CallUtils.java +++ b/InCallUI/src/com/android/incallui/CallUtils.java @@ -61,7 +61,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) { |