TerminalView: only use accessibility features when accessibility is

enabled when starting the view
This commit is contained in:
Peter Vágner
2018-06-27 20:03:27 +02:00
committed by Fredrik Fornwall
parent 5652624fc2
commit d1f0c76db3

View File

@@ -15,6 +15,7 @@ import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.accessibility.AccessibilityManager;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.InputDevice; 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. */ /** If non-zero, this is the last unicode code point received if that was a combining character. */
int mCombiningAccent; int mCombiningAccent;
private boolean mAccessibilityEnabled;
public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code) public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
super(context, attributes); super(context, attributes);
mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() { mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() {
@@ -197,6 +200,8 @@ public final class TerminalView extends View {
} }
}); });
mScroller = new Scroller(context); 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(); mEmulator.clearScrollCounter();
invalidate(); invalidate();
setContentDescription(getText()); if (mAccessibilityEnabled) setContentDescription(getText());
} }
/** /**