diff options
| author | jiadongz <jiadongz@codeaurora.org> | 2015-02-05 15:01:12 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-09 11:35:38 -0800 |
| commit | d5afa9a51e7405a0be897e81d3f7469b26da6b1c (patch) | |
| tree | e864ade40d4551d5c04e2754b215ac9c4191b1b2 | |
| parent | 77bc21f9fe7c26481723fda83fc2b6136bc1b86f (diff) | |
| download | android_packages_apps_InCallUI-d5afa9a51e7405a0be897e81d3f7469b26da6b1c.tar.gz android_packages_apps_InCallUI-d5afa9a51e7405a0be897e81d3f7469b26da6b1c.tar.bz2 android_packages_apps_InCallUI-d5afa9a51e7405a0be897e81d3f7469b26da6b1c.zip | |
Add more state for conference call
Add more string indicating conference participant state.
Change-Id: If2d463157a253d76695ea676a79e926fa075eabf
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/incallui/ConferenceParticipantListAdapter.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 81b3f563..fe134f6b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -634,6 +634,8 @@ <string name="call_state_dialing">Dialing</string> <string name="call_state_holding">Holding</string> <string name="call_state_active">Active</string> + <string name="call_state_unknown">Unknown</string> + <string name="call_state_disconnecting">Disconnecting</string> <string name="call_state_disconnected">Disconnected</string> <string name="dial_conference_call_error">Cannot create a 4G conference call, because the 4G network is not available.</string> </resources> diff --git a/src/com/android/incallui/ConferenceParticipantListAdapter.java b/src/com/android/incallui/ConferenceParticipantListAdapter.java index fec5467c..247b4886 100644 --- a/src/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/src/com/android/incallui/ConferenceParticipantListAdapter.java @@ -359,17 +359,23 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { case Call.State.ACTIVE: res = R.string.call_state_active; break; + case Call.State.NEW: + case Call.State.IDLE: case Call.State.DIALING: + case Call.State.REDIALING: res = R.string.call_state_dialing; break; case Call.State.ONHOLD: res = R.string.call_state_holding; break; + case Call.State.DISCONNECTING: + res = R.string.call_state_disconnecting; + break; case Call.State.DISCONNECTED: res = R.string.call_state_disconnected; break; default: - res = R.string.call_state_active; + res = R.string.call_state_unknown; } return res; } |