diff options
author | Nancy Chen <nancychen@google.com> | 2014-12-02 18:23:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-02 18:23:19 +0000 |
commit | dabb63ef13c9ab30c54adfbbd736f76723f337c1 (patch) | |
tree | 84ba8c31ba9b4a6ad4c1daaeac134291fab3f1ef | |
parent | bd4440be6e5e8ea2c01c1e3c6c1d0e3c9344a6bd (diff) | |
parent | 170e405691a237b74fbecbf41208cbaa5bd36442 (diff) |
Merge "Stop ringer when selecting "respond via text"." into lmp-mr1-dev
3 files changed, 7 insertions, 15 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 339850a13..e579d643a 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -17,6 +17,7 @@ package com.android.incallui; import android.content.Context; +import android.telecom.TelecomManager; import java.util.List; @@ -157,6 +158,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> public void onText() { if (getUi() != null) { + InCallPresenter.getInstance().getTelecomManager().silenceRinger(); getUi().showMessageDialog(); } } diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 07feb2950..aead4c866 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -66,7 +66,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private ContactCacheEntry mSecondaryContactInfo; private CallTimer mCallTimer; private Context mContext; - private TelecomManager mTelecomManager; public static class ContactLookupCallback implements ContactInfoCacheCallback { private final WeakReference<CallCardPresenter> mCallCardPresenter; @@ -281,8 +280,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> // number directly from the telephony layer). PhoneAccountHandle accountHandle = mPrimary.getAccountHandle(); if (accountHandle != null) { - TelecomManager mgr = - (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); + TelecomManager mgr = InCallPresenter.getInstance().getTelecomManager(); PhoneAccount account = mgr.getPhoneAccount(accountHandle); if (account != null) { return getNumberFromHandle(account.getSubscriptionAddress()); @@ -559,7 +557,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> if (accountHandle == null) { return null; } - return getTelecomManager().getPhoneAccount(accountHandle); + return InCallPresenter.getInstance().getTelecomManager().getPhoneAccount(accountHandle); } /** @@ -577,8 +575,9 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> */ private String getCallProviderLabel(Call call) { PhoneAccount account = getAccountForCall(call); + TelecomManager mgr = InCallPresenter.getInstance().getTelecomManager(); if (account != null && !TextUtils.isEmpty(account.getLabel()) - && getTelecomManager().hasMultipleCallCapableAccounts()) { + && mgr.hasMultipleCallCapableAccounts()) { return account.getLabel().toString(); } return null; @@ -694,14 +693,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> ui.setCallCardVisible(!isFullScreenVideo); } - private TelecomManager getTelecomManager() { - if (mTelecomManager == null) { - mTelecomManager = - (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); - } - return mTelecomManager; - } - private String getConferenceString(Call call) { boolean isGenericConference = call.can( android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE); diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index d48225c41..858f2136f 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -1195,7 +1195,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { /** * @return An instance of TelecomManager. */ - private TelecomManager getTelecomManager() { + public TelecomManager getTelecomManager() { if (mTelecomManager == null) { mTelecomManager = (TelecomManager) mInCallActivity.getSystemService(Context.TELECOM_SERVICE); @@ -1203,7 +1203,6 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { return mTelecomManager; } - /** * Private constructor. Must use getInstance() to get this singleton. */ |