From d1f0c76db3eb85fce74af7aa8e39aecb41e8f8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Wed, 27 Jun 2018 20:03:27 +0200 Subject: [PATCH] TerminalView: only use accessibility features when accessibility is enabled when starting the view --- .../src/main/java/com/termux/view/TerminalView.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java index 8bd6c982..feadb25d 100644 --- a/terminal-view/src/main/java/com/termux/view/TerminalView.java +++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java @@ -15,6 +15,7 @@ import android.text.InputType; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; +import android.view.accessibility.AccessibilityManager; import android.view.ActionMode; import android.view.HapticFeedbackConstants; import android.view.InputDevice; @@ -75,6 +76,8 @@ public final class TerminalView extends View { /** If non-zero, this is the last unicode code point received if that was a combining character. */ int mCombiningAccent; + private boolean mAccessibilityEnabled; + public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code) super(context, attributes); mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() { @@ -197,6 +200,8 @@ public final class TerminalView extends View { } }); mScroller = new Scroller(context); + AccessibilityManager am = (AccessibilityManager) context.getSystemService(context.ACCESSIBILITY_SERVICE); + mAccessibilityEnabled = am.isEnabled(); } /** @@ -384,7 +389,7 @@ public final class TerminalView extends View { mEmulator.clearScrollCounter(); invalidate(); - setContentDescription(getText()); + if (mAccessibilityEnabled) setContentDescription(getText()); } /**