drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-10-19 18:15:52 -07:00
committed by Android (Google) Code Review
parent 84e825a84d bb1b9ea8a4
commit 06044fe114
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,20 +463,34 @@ public class AccessibilityServiceInfo implements Parcelable {
* @return The string representation. * @return The string representation.
*/ */
public static String feedbackTypeToString(int feedbackType) { public static String feedbackTypeToString(int feedbackType) {
switch (feedbackType) { StringBuilder builder = new StringBuilder();
case FEEDBACK_AUDIBLE: builder.append("[");
return "FEEDBACK_AUDIBLE"; while (feedbackType > 0) {
case FEEDBACK_HAPTIC: final int feedbackTypeFlag = 1 << Integer.numberOfTrailingZeros(feedbackType);
return "FEEDBACK_HAPTIC"; feedbackType &= ~feedbackTypeFlag;
case FEEDBACK_GENERIC: if (builder.length() > 1) {
return "FEEDBACK_GENERIC"; builder.append(", ");
case FEEDBACK_SPOKEN: }
return "FEEDBACK_SPOKEN"; switch (feedbackTypeFlag) {
case FEEDBACK_VISUAL: case FEEDBACK_AUDIBLE:
return "FEEDBACK_VISUAL"; builder.append("FEEDBACK_AUDIBLE");
default: break;
return null; case FEEDBACK_HAPTIC:
builder.append("FEEDBACK_HAPTIC");
break;
case FEEDBACK_GENERIC:
builder.append("FEEDBACK_GENERIC");
break;
case FEEDBACK_SPOKEN:
builder.append("FEEDBACK_SPOKEN");
break;
case FEEDBACK_VISUAL:
builder.append("FEEDBACK_VISUAL");
break;
}
} }
builder.append("]");
return builder.toString();
} }
/** /**