diff options
| author | 2024-05-29 18:26:44 +0000 | |
|---|---|---|
| committer | 2024-05-29 18:26:44 +0000 | |
| commit | 906e8c0803dab85a6eeaffdf535be346e8870c49 (patch) | |
| tree | 597dd139ea2c9709ffa121833ff12dd09c843f2f | |
| parent | 8d3a8fb2e04ae7f732628695cc2e660ab87b77a6 (diff) | |
| parent | 29ff5d9e715427f5e9186aa7f77d3f4faba618d9 (diff) | |
Merge "Don't show error message when handwriting is unsupported by IME or disabled" into main
| -rw-r--r-- | core/java/android/view/HandwritingInitiator.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java index beb4d95263be..57d1b8d18fe1 100644 --- a/core/java/android/view/HandwritingInitiator.java +++ b/core/java/android/view/HandwritingInitiator.java @@ -227,7 +227,10 @@ public class HandwritingInitiator { mState.mStylusDownY, /* isHover */ false); if (candidateView != null && candidateView.isEnabled()) { boolean candidateHasFocus = candidateView.hasFocus(); - if (shouldShowHandwritingUnavailableMessageForView(candidateView)) { + if (!candidateView.isStylusHandwritingAvailable()) { + mState.mShouldInitHandwriting = false; + return false; + } else if (shouldShowHandwritingUnavailableMessageForView(candidateView)) { int messagesResId = (candidateView instanceof TextView tv && tv.isAnyPasswordInputType()) ? R.string.error_handwriting_unsupported_password |