summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Ghan <justinghan@google.com> 2024-05-21 14:32:54 -0700
committer Justin Ghan <justinghan@google.com> 2024-05-21 14:47:20 -0700
commit29ff5d9e715427f5e9186aa7f77d3f4faba618d9 (patch)
treed6c4b729ed6e32d218732f8f8ac015eb0f47b12a
parent9b3bbe33039b92f5c3f593476f5c544f56ae1b61 (diff)
Don't show error message when handwriting is unsupported by IME or disabled
Bug: 339564132 Bug: 297962571 Test: atest StylusHandwritingTest Flag: com.android.text.flags.handwriting_unsupported_message Change-Id: Ic2d7af32b0e41933e1c9a5fff26ba59a4b123b49
-rw-r--r--core/java/android/view/HandwritingInitiator.java5
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