Merge "Prune repetetive code in A11yEvent toString" (55270840) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityEvent.java

+43 −176

Original line number	Original line	Diff line number	Diff line
	@@ -1240,190 +1240,57 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
	while (eventType != 0) {		while (eventType != 0) {
	final int eventTypeFlag = 1 << Integer.numberOfTrailingZeros(eventType);		final int eventTypeFlag = 1 << Integer.numberOfTrailingZeros(eventType);
	eventType &= ~eventTypeFlag;		eventType &= ~eventTypeFlag;
	switch (eventTypeFlag) {
	case TYPE_VIEW_CLICKED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_CLICKED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_LONG_CLICKED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_LONG_CLICKED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_SELECTED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_SELECTED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_FOCUSED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_FOCUSED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_TEXT_CHANGED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_TEXT_CHANGED");
	eventTypeCount++;
	} break;
	case TYPE_WINDOW_STATE_CHANGED: {
	if (eventTypeCount > 0) {		if (eventTypeCount > 0) {
	builder.append(", ");		builder.append(", ");
	}		}
	builder.append("TYPE_WINDOW_STATE_CHANGED");		builder.append(singleEventTypeToString(eventTypeFlag));

	eventTypeCount++;		eventTypeCount++;
	} break;
	case TYPE_VIEW_HOVER_ENTER: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}		}
	builder.append("TYPE_VIEW_HOVER_ENTER");		if (eventTypeCount > 1) {
	eventTypeCount++;		builder.insert(0, '[');
	} break;		builder.append(']');
	case TYPE_VIEW_HOVER_EXIT: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}		}
	builder.append("TYPE_VIEW_HOVER_EXIT");		return builder.toString();
	eventTypeCount++;
	} break;
	case TYPE_NOTIFICATION_STATE_CHANGED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}		}
	builder.append("TYPE_NOTIFICATION_STATE_CHANGED");
	eventTypeCount++;		private static String singleEventTypeToString(int eventType) {
	} break;		switch (eventType) {
			case TYPE_VIEW_CLICKED: return "TYPE_VIEW_CLICKED";
			case TYPE_VIEW_LONG_CLICKED: return "TYPE_VIEW_LONG_CLICKED";
			case TYPE_VIEW_SELECTED: return "TYPE_VIEW_SELECTED";
			case TYPE_VIEW_FOCUSED: return "TYPE_VIEW_FOCUSED";
			case TYPE_VIEW_TEXT_CHANGED: return "TYPE_VIEW_TEXT_CHANGED";
			case TYPE_WINDOW_STATE_CHANGED: return "TYPE_WINDOW_STATE_CHANGED";
			case TYPE_VIEW_HOVER_ENTER: return "TYPE_VIEW_HOVER_ENTER";
			case TYPE_VIEW_HOVER_EXIT: return "TYPE_VIEW_HOVER_EXIT";
			case TYPE_NOTIFICATION_STATE_CHANGED: return "TYPE_NOTIFICATION_STATE_CHANGED";
	case TYPE_TOUCH_EXPLORATION_GESTURE_START: {		case TYPE_TOUCH_EXPLORATION_GESTURE_START: {
	if (eventTypeCount > 0) {		return "TYPE_TOUCH_EXPLORATION_GESTURE_START";
	builder.append(", ");		}
	}		case TYPE_TOUCH_EXPLORATION_GESTURE_END: return "TYPE_TOUCH_EXPLORATION_GESTURE_END";
	builder.append("TYPE_TOUCH_EXPLORATION_GESTURE_START");		case TYPE_WINDOW_CONTENT_CHANGED: return "TYPE_WINDOW_CONTENT_CHANGED";
	eventTypeCount++;		case TYPE_VIEW_TEXT_SELECTION_CHANGED: return "TYPE_VIEW_TEXT_SELECTION_CHANGED";
	} break;		case TYPE_VIEW_SCROLLED: return "TYPE_VIEW_SCROLLED";
	case TYPE_TOUCH_EXPLORATION_GESTURE_END: {		case TYPE_ANNOUNCEMENT: return "TYPE_ANNOUNCEMENT";
	if (eventTypeCount > 0) {		case TYPE_VIEW_ACCESSIBILITY_FOCUSED: return "TYPE_VIEW_ACCESSIBILITY_FOCUSED";
	builder.append(", ");
	}
	builder.append("TYPE_TOUCH_EXPLORATION_GESTURE_END");
	eventTypeCount++;
	} break;
	case TYPE_WINDOW_CONTENT_CHANGED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_WINDOW_CONTENT_CHANGED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_TEXT_SELECTION_CHANGED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_TEXT_SELECTION_CHANGED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_SCROLLED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_SCROLLED");
	eventTypeCount++;
	} break;
	case TYPE_ANNOUNCEMENT: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_ANNOUNCEMENT");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_ACCESSIBILITY_FOCUSED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_ACCESSIBILITY_FOCUSED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {		case TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {
	if (eventTypeCount > 0) {		return "TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED";
	builder.append(", ");
	}		}
	builder.append("TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY: {		case TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY: {
	if (eventTypeCount > 0) {		return "TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY";
	builder.append(", ");
	}
	builder.append("TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY");
	eventTypeCount++;
	} break;
	case TYPE_GESTURE_DETECTION_START: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_GESTURE_DETECTION_START");
	eventTypeCount++;
	} break;
	case TYPE_GESTURE_DETECTION_END: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_GESTURE_DETECTION_END");
	eventTypeCount++;
	} break;
	case TYPE_TOUCH_INTERACTION_START: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_TOUCH_INTERACTION_START");
	eventTypeCount++;
	} break;
	case TYPE_TOUCH_INTERACTION_END: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_TOUCH_INTERACTION_END");
	eventTypeCount++;
	} break;
	case TYPE_WINDOWS_CHANGED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}
	builder.append("TYPE_WINDOWS_CHANGED");
	eventTypeCount++;
	} break;
	case TYPE_VIEW_CONTEXT_CLICKED: {
	if (eventTypeCount > 0) {
	builder.append(", ");
	}		}
	builder.append("TYPE_VIEW_CONTEXT_CLICKED");		case TYPE_GESTURE_DETECTION_START: return "TYPE_GESTURE_DETECTION_START";
	eventTypeCount++;		case TYPE_GESTURE_DETECTION_END: return "TYPE_GESTURE_DETECTION_END";
	} break;		case TYPE_TOUCH_INTERACTION_START: return "TYPE_TOUCH_INTERACTION_START";
	case TYPE_ASSIST_READING_CONTEXT: {		case TYPE_TOUCH_INTERACTION_END: return "TYPE_TOUCH_INTERACTION_END";
	if (eventTypeCount > 0) {		case TYPE_WINDOWS_CHANGED: return "TYPE_WINDOWS_CHANGED";
	builder.append(", ");		case TYPE_VIEW_CONTEXT_CLICKED: return "TYPE_VIEW_CONTEXT_CLICKED";
	}		case TYPE_ASSIST_READING_CONTEXT: return "TYPE_ASSIST_READING_CONTEXT";
	builder.append("TYPE_ASSIST_READING_CONTEXT");		default: return Integer.toHexString(eventType);
	eventTypeCount++;
	} break;
	}		}
	}		}
	if (eventTypeCount > 1) {
	builder.insert(0, '[');
	builder.append(']');
	}
	return builder.toString();
	}

	/**		/**
	* @see Parcelable.Creator		* @see Parcelable.Creator