diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-20 03:01:40 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-20 03:01:40 -0800 |
| commit | d55e26ab8c7ba404992d2da1bc0540979b7f8202 (patch) | |
| tree | ab6614a659ad49ccbe74b5bd476c7a0c534e67f0 /src | |
| parent | 179e2dd1e0de9192b24cf850115e0990d5c353c0 (diff) | |
| parent | 8679ea4a8bdde9a956d0bfcf0f08064f4c868c02 (diff) | |
| download | packages_apps_InCallUI-d55e26ab8c7ba404992d2da1bc0540979b7f8202.tar.gz packages_apps_InCallUI-d55e26ab8c7ba404992d2da1bc0540979b7f8202.tar.bz2 packages_apps_InCallUI-d55e26ab8c7ba404992d2da1bc0540979b7f8202.zip | |
Merge "Voice Privacy Icon Support for CDMA"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/incallui/StatusBarNotifier.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java index 98442671..19595b82 100644 --- a/src/com/android/incallui/StatusBarNotifier.java +++ b/src/com/android/incallui/StatusBarNotifier.java @@ -451,10 +451,22 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { // different calls. So if both lines are in use, display info // from the foreground call. And if there's a ringing call, // display that regardless of the state of the other calls. + int resId; + int voicePrivacy = call.getCapabilities() & Call.Capabilities.VOICE_PRIVACY; if (call.getState() == Call.State.ONHOLD) { - return R.drawable.stat_sys_phone_call_on_hold; + if (voicePrivacy != 0) { + resId = R.drawable.stat_sys_vp_phone_call_on_hold; + } else { + resId = R.drawable.stat_sys_phone_call_on_hold; + } + } else { + if (voicePrivacy != 0) { + resId = R.drawable.stat_sys_vp_phone_call; + } else { + resId = R.drawable.stat_sys_phone_call; + } } - return R.drawable.stat_sys_phone_call; + return resId; } /** |