diff options
author | Casey Burkhardt <caseyburkhardt@google.com> | 2010-08-09 20:04:34 -0700 |
---|---|---|
committer | Casey Burkhardt <caseyburkhardt@google.com> | 2010-08-09 20:04:34 -0700 |
commit | 662b3208168726e9b4050fc9666181bee7585a5b (patch) | |
tree | 62acd651afe0a4b5a963f3365c892ab121d187fe | |
parent | 79c6f8b2df9023bf46d6b2829ecf69bc4672566a (diff) | |
download | connectbot-662b3208168726e9b4050fc9666181bee7585a5b.tar.gz connectbot-662b3208168726e9b4050fc9666181bee7585a5b.tar.bz2 connectbot-662b3208168726e9b4050fc9666181bee7585a5b.zip |
Fixing formatting issues.
-rwxr-xr-x | src/org/connectbot/TerminalView.java | 167 |
1 files changed, 84 insertions, 83 deletions
diff --git a/src/org/connectbot/TerminalView.java b/src/org/connectbot/TerminalView.java index 057399f..c99680b 100755 --- a/src/org/connectbot/TerminalView.java +++ b/src/org/connectbot/TerminalView.java @@ -73,11 +73,11 @@ public class TerminalView extends View implements FontSizeChangedListener { // Related to Accessibility Features private boolean accessibilityActive = false; - private StringBuffer accessibilityBuffer = null; + private StringBuffer accessibilityBuffer = null; private AccessibilityEventSender eventSender = null; private int ACCESSIBILITY_EVENT_THRESHOLD = 1000; private static final String SCREENREADER_INTENT_ACTION = "android.accessibilityservice.AccessibilityService"; - private static final String SCREENREADER_INTENT_CATEGORY = "android.accessibilityservice.category.FEEDBACK_SPOKEN"; + private static final String SCREENREADER_INTENT_CATEGORY = "android.accessibilityservice.category.FEEDBACK_SPOKEN"; public TerminalView(Context context, TerminalBridge bridge) { super(context); @@ -288,92 +288,93 @@ public class TerminalView extends View implements FontSizeChangedListener { return new BaseInputConnection(this, false); } - private boolean isScreenReaderActive() { - // Restrict the set of intents to only accessibility services that have - // the category FEEDBACK_SPOKEN (aka, screen readers). - Intent screenReaderIntent = new Intent(SCREENREADER_INTENT_ACTION); - screenReaderIntent.addCategory(SCREENREADER_INTENT_CATEGORY); - List<ResolveInfo> screenReaders = context.getPackageManager().queryIntentServices( - screenReaderIntent, 0); - ContentResolver cr = context.getContentResolver(); - Cursor cursor = null; - int status = 0; - for (ResolveInfo screenReader : screenReaders) { - // All screen readers are expected to implement a content provider that responds to - // content://<nameofpackage>.providers.StatusProvider - cursor = cr.query(Uri.parse("content://" + screenReader.serviceInfo.packageName - + ".providers.StatusProvider"), null, null, null, null); - if (cursor != null) { - cursor.moveToFirst(); - // These content providers use a special cursor that only has one element, - // an integer that is 1 if the screen reader is running. - status = cursor.getInt(0); - cursor.close(); - if (status == 1) { - return true; - } - } - } - return false; - } - + private boolean isScreenReaderActive() { + // Restrict the set of intents to only accessibility services that have + // the category FEEDBACK_SPOKEN (aka, screen readers). + Intent screenReaderIntent = new Intent(SCREENREADER_INTENT_ACTION); + screenReaderIntent.addCategory(SCREENREADER_INTENT_CATEGORY); + List<ResolveInfo> screenReaders = context.getPackageManager().queryIntentServices( + screenReaderIntent, 0); + ContentResolver cr = context.getContentResolver(); + Cursor cursor = null; + int status = 0; + for (ResolveInfo screenReader : screenReaders) { + // All screen readers are expected to implement a content provider + // that responds to: + // content://<nameofpackage>.providers.StatusProvider + cursor = cr.query(Uri.parse("content://" + screenReader.serviceInfo.packageName + + ".providers.StatusProvider"), null, null, null, null); + if (cursor != null) { + cursor.moveToFirst(); + // These content providers use a special cursor that only has + // one element, an integer that is 1 if the screen reader is + // running. + status = cursor.getInt(0); + cursor.close(); + if (status == 1) { + return true; + } + } + } + return false; + } public StringBuffer getAccessibilityBuffer() { - return accessibilityBuffer; + return accessibilityBuffer; } - public void propagateConsoleText(char[] rawText, int length) { - if (accessibilityActive) { - if (accessibilityBuffer == null) { - accessibilityBuffer = new StringBuffer(); - } - - for (int i = 0; i < length; ++i) { - accessibilityBuffer.append(rawText[i]); - } - - if (eventSender != null) { - removeCallbacks(eventSender); - } else { - eventSender = new AccessibilityEventSender(); - } - postDelayed(eventSender, ACCESSIBILITY_EVENT_THRESHOLD); - } - } + public void propagateConsoleText(char[] rawText, int length) { + if (accessibilityActive) { + if (accessibilityBuffer == null) { + accessibilityBuffer = new StringBuffer(); + } + + for (int i = 0; i < length; ++i) { + accessibilityBuffer.append(rawText[i]); + } + + if (eventSender != null) { + removeCallbacks(eventSender); + } else { + eventSender = new AccessibilityEventSender(); + } + postDelayed(eventSender, ACCESSIBILITY_EVENT_THRESHOLD); + } + } private class AccessibilityEventSender implements Runnable { - public void run() { - synchronized (accessibilityBuffer) { - // Strip Console Codes - String regex = "" + ((char) 27) + (char) 92 + ((char) 91) + "[^m]+[m|:]"; - accessibilityBuffer = - new StringBuffer(accessibilityBuffer.toString().replaceAll(regex, " ")); - - // Apply Backspaces - String backspaceCode = "" + ((char) 8) + ((char) 27) + ((char) 91) + ((char) 75); - int i = accessibilityBuffer.indexOf(backspaceCode); - while (i != -1) { - if (i == 0) { - accessibilityBuffer = - accessibilityBuffer.replace(i, i + backspaceCode.length(), ""); - } else { - accessibilityBuffer = - accessibilityBuffer.replace(i - 1, i + backspaceCode.length(), ""); - } - i = accessibilityBuffer.indexOf(backspaceCode); - } - - if (accessibilityBuffer.length() > 0) { - AccessibilityEvent event = - AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED); - event.setFromIndex(0); - event.setAddedCount(accessibilityBuffer.length()); - event.getText().add(accessibilityBuffer); - - sendAccessibilityEventUnchecked(event); - accessibilityBuffer.setLength(0); - } - } - } + public void run() { + synchronized (accessibilityBuffer) { + // Strip console codes with regex matching control codes + String regex = "" + ((char) 27) + (char) 92 + ((char) 91) + "[^m]+[m|:]"; + accessibilityBuffer = new StringBuffer( + accessibilityBuffer.toString().replaceAll(regex, " ")); + + // Apply Backspaces using backspace character sequence + String backspaceCode = "" + ((char) 8) + ((char) 27) + ((char) 91) + ((char) 75); + int i = accessibilityBuffer.indexOf(backspaceCode); + while (i != -1) { + if (i == 0) { + accessibilityBuffer = accessibilityBuffer.replace( + i, i + backspaceCode.length(), ""); + } else { + accessibilityBuffer = accessibilityBuffer.replace( + i - 1, i + backspaceCode.length(), ""); + } + i = accessibilityBuffer.indexOf(backspaceCode); + } + + if (accessibilityBuffer.length() > 0) { + AccessibilityEvent event = AccessibilityEvent.obtain( + AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED); + event.setFromIndex(0); + event.setAddedCount(accessibilityBuffer.length()); + event.getText().add(accessibilityBuffer); + + sendAccessibilityEventUnchecked(event); + accessibilityBuffer.setLength(0); + } + } + } } } |