diff options
author | Yorke Lee <yorkelee@google.com> | 2014-09-24 22:22:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 22:22:50 +0000 |
commit | d35d084eb6d71323fdd8c01a6aae3122b9a77ab8 (patch) | |
tree | d858730fb4bd1b098babdfd78be14a394ac3cb45 /InCallUI | |
parent | 9a212faad9edf38f0d9b527abd0bfe9491d256d7 (diff) | |
parent | 9b75781430dbc6edaf223676fccc570b931cd7c2 (diff) |
am 04746eec: Reallow quick text response on lockscreen
* commit '04746eec88c92d9130168455432db6f0cf9db04c':
Reallow quick text response on lockscreen
Diffstat (limited to 'InCallUI')
-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 { |