diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-09-25 00:16:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 00:16:29 +0000 |
| commit | cf1d054cd493420b50eeb249e2c273d2068a5347 (patch) | |
| tree | 67b61b096979b70dc6981d75882bb287ade24e8c | |
| parent | 9e81215b3ba546375717df548bb8c4a00702db6a (diff) | |
| parent | 43c5e0022b5f8345316608e996904c26c75cbe1b (diff) | |
am 0e3c59bd: am c74a2f38: am 7b601bc0: am 5e001805: am 04746eec: Reallow quick text response on lockscreen
* commit '0e3c59bde9ffa682b78c1cbbab37eadfcbd6155c':
Reallow quick text response on lockscreen
| -rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index e42f1fcae..8aa8615da 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -176,21 +176,18 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> private void configureAnswerTargetsForSms(Call call, List<String> textMsgs) { final Context context = getUi().getContext(); - final KeyguardManager km = - (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); - final boolean isLockScreenShowing = km.inKeyguardRestrictedInputMode(); mHasTextMessages = textMsgs != null; boolean withSms = call.can(PhoneCapabilities.RESPOND_VIA_TEXT) && mHasTextMessages; if (call.isVideoCall(context)) { - if (withSms && !isLockScreenShowing) { + if (withSms) { getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITH_SMS); getUi().configureMessageDialog(textMsgs); } else { getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITHOUT_SMS); } } else { - if (withSms && !isLockScreenShowing) { + if (withSms) { getUi().showTargets(AnswerFragment.TARGET_SET_FOR_AUDIO_WITH_SMS); getUi().configureMessageDialog(textMsgs); } else { |