Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 01fa8889: Merge "Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo." into jb-mr1-dev

Browse Source 
* commit '01fa888903fecd2e85bdfa9dd0bceebab6244389':
  Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo.
This commit is contained in:
Svetoslav Ganov
2012-09-06 19:46:15 -07:00
committed by Android Git Automerger
parent b13630e89a 01fa888903
commit bf82338e7a
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -2066,6 +2066,7 @@ package android.accessibilityservice {
field public static final int DEFAULT = 1; // 0x1 field public static final int DEFAULT = 1; // 0x1
field public static final int FEEDBACK_ALL_MASK = -1; // 0xffffffff field public static final int FEEDBACK_ALL_MASK = -1; // 0xffffffff
field public static final int FEEDBACK_AUDIBLE = 4; // 0x4 field public static final int FEEDBACK_AUDIBLE = 4; // 0x4
field public static final int FEEDBACK_BRAILLE = 32; // 0x20
field public static final int FEEDBACK_GENERIC = 16; // 0x10 field public static final int FEEDBACK_GENERIC = 16; // 0x10
field public static final int FEEDBACK_HAPTIC = 2; // 0x2 field public static final int FEEDBACK_HAPTIC = 2; // 0x2
field public static final int FEEDBACK_SPOKEN = 1; // 0x1 field public static final int FEEDBACK_SPOKEN = 1; // 0x1

13
core/java/android/accessibilityservice/AccessibilityServiceInfo.java
View File

@@ -84,6 +84,11 @@ public class AccessibilityServiceInfo implements Parcelable {
*/ */
public static final int FEEDBACK_GENERIC = 0x0000010; public static final int FEEDBACK_GENERIC = 0x0000010;
/**
* Denotes braille feedback.
*/
public static final int FEEDBACK_BRAILLE = 0x0000020;
/** /**
* Mask for all feedback types. * Mask for all feedback types.
* *
@@ -92,6 +97,7 @@ public class AccessibilityServiceInfo implements Parcelable {
* @see #FEEDBACK_AUDIBLE * @see #FEEDBACK_AUDIBLE
* @see #FEEDBACK_VISUAL * @see #FEEDBACK_VISUAL
* @see #FEEDBACK_GENERIC * @see #FEEDBACK_GENERIC
* @see #FEEDBACK_BRAILLE
*/ */
public static final int FEEDBACK_ALL_MASK = 0xFFFFFFFF; public static final int FEEDBACK_ALL_MASK = 0xFFFFFFFF;
@@ -186,6 +192,7 @@ public class AccessibilityServiceInfo implements Parcelable {
* @see #FEEDBACK_HAPTIC * @see #FEEDBACK_HAPTIC
* @see #FEEDBACK_SPOKEN * @see #FEEDBACK_SPOKEN
* @see #FEEDBACK_VISUAL * @see #FEEDBACK_VISUAL
* @see #FEEDBACK_BRAILLE
*/ */
public int feedbackType; public int feedbackType;
@@ -591,6 +598,12 @@ public class AccessibilityServiceInfo implements Parcelable {
} }
builder.append("FEEDBACK_VISUAL"); builder.append("FEEDBACK_VISUAL");
break; break;
case FEEDBACK_BRAILLE:
if (builder.length() > 1) {
builder.append(", ");
}
builder.append("FEEDBACK_BRAILLE");
break;
} }
} }
builder.append("]"); builder.append("]");