diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-07-14 23:20:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-14 18:38:02 +0000 |
| commit | 121213bc2768e7666454b0940f23a77621936b5f (patch) | |
| tree | 22e2f9db13c74f6a614bea23f54c2140f02dfa66 | |
| parent | 8d38cf6761ae048b1a42504f1b59e872cf43df47 (diff) | |
| parent | 4feb57b986dc6b1edc5dc026a926b4934778716d (diff) | |
Merge "Implement multi-SIM capabilities (4/6) [DO NOT MERGE]" into lmp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index bc9fadfd8..9e400d738 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -22,6 +22,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.telecomm.CallCapabilities; import android.telecomm.PhoneAccount; +import android.telecomm.TelecommManager; import android.telephony.DisconnectCause; import android.text.TextUtils; import android.text.format.DateUtils; @@ -53,6 +54,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private ContactCacheEntry mSecondaryContactInfo; private CallTimer mCallTimer; private Context mContext; + private TelecommManager mTelecommManager; public CallCardPresenter() { // create the call timer @@ -404,7 +406,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private Drawable getConnectionIcon() { PhoneAccount account = mPrimary.getAccount(); if (account != null) { - return account.getIcon(mContext); + return getTelecommManager().getPhoneAccountMetadata(account) + .getIcon(mContext); } return null; } @@ -428,7 +431,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } PhoneAccount account = mPrimary.getAccount(); if (account != null) { - return account.getLabel(mContext); + return getTelecommManager().getPhoneAccountMetadata(account).getLabel(); } return null; } @@ -436,7 +439,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private String getSecondaryCallProviderLabel() { PhoneAccount account = mSecondary.getAccount(); if (account != null) { - return account.getLabel(mContext); + return getTelecommManager().getPhoneAccountMetadata(account).getLabel(); } return null; } @@ -444,7 +447,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private Drawable getSecondaryCallProviderIcon() { PhoneAccount account = mSecondary.getAccount(); if (account != null) { - return account.getIcon(mContext); + return getTelecommManager().getPhoneAccountMetadata(account) + .getIcon(mContext); } return null; } @@ -519,4 +523,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> void setPrimaryLabel(String label); void setEndCallButtonEnabled(boolean enabled); } + + private TelecommManager getTelecommManager() { + if (mTelecommManager == null) { + mTelecommManager = TelecommManager.from(mContext); + } + return mTelecommManager; + } } |