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

Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev

Browse Source
This commit is contained in:
Phil Weaver
2018-04-11 16:38:28 +00:00
committed by Android (Google) Code Review
parent 997e7b7ea4 21c6043542
commit 441ef0b94b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/view/accessibility/AccessibilityEvent.java
View File

@@ -201,6 +201,7 @@ import java.util.List;
* <em>Properties:</em></br> * <em>Properties:</em></br>
* <ul> * <ul>
* <li>{@link #getEventType()} - The type of the event.</li> * <li>{@link #getEventType()} - The type of the event.</li>
* <li>{@link #getContentChangeTypes()} - The type of state changes.</li>
* <li>{@link #getSource()} - The source info (for registered clients).</li> * <li>{@link #getSource()} - The source info (for registered clients).</li>
* <li>{@link #getClassName()} - The class name of the source.</li> * <li>{@link #getClassName()} - The class name of the source.</li>
* <li>{@link #getPackageName()} - The package name of the source.</li> * <li>{@link #getPackageName()} - The package name of the source.</li>
@@ -863,16 +864,17 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
} }
/** /**
* Gets the bit mask of change types signaled by an * Gets the bit mask of change types signaled by a
* {@link #TYPE_WINDOW_CONTENT_CHANGED} event. A single event may represent * {@link #TYPE_WINDOW_CONTENT_CHANGED} event or {@link #TYPE_WINDOW_STATE_CHANGED}. A single
* multiple change types. * event may represent multiple change types.
* *
* @return The bit mask of change types. One or more of: * @return The bit mask of change types. One or more of:
* <ul> * <ul>
* <li>{@link AccessibilityEvent#CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION} * <li>{@link #CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION}
* <li>{@link AccessibilityEvent#CONTENT_CHANGE_TYPE_SUBTREE} * <li>{@link #CONTENT_CHANGE_TYPE_SUBTREE}
* <li>{@link AccessibilityEvent#CONTENT_CHANGE_TYPE_TEXT} * <li>{@link #CONTENT_CHANGE_TYPE_TEXT}
* <li>{@link AccessibilityEvent#CONTENT_CHANGE_TYPE_UNDEFINED} * <li>{@link #CONTENT_CHANGE_TYPE_PANE_TITLE}
* <li>{@link #CONTENT_CHANGE_TYPE_UNDEFINED}
* </ul> * </ul>
*/ */
@ContentChangeTypes @ContentChangeTypes
@@ -891,6 +893,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
} }
case CONTENT_CHANGE_TYPE_SUBTREE: return "CONTENT_CHANGE_TYPE_SUBTREE"; case CONTENT_CHANGE_TYPE_SUBTREE: return "CONTENT_CHANGE_TYPE_SUBTREE";
case CONTENT_CHANGE_TYPE_TEXT: return "CONTENT_CHANGE_TYPE_TEXT"; case CONTENT_CHANGE_TYPE_TEXT: return "CONTENT_CHANGE_TYPE_TEXT";
case CONTENT_CHANGE_TYPE_PANE_TITLE: return "CONTENT_CHANGE_TYPE_PANE_TITLE";
case CONTENT_CHANGE_TYPE_UNDEFINED: return "CONTENT_CHANGE_TYPE_UNDEFINED"; case CONTENT_CHANGE_TYPE_UNDEFINED: return "CONTENT_CHANGE_TYPE_UNDEFINED";
default: return Integer.toHexString(type); default: return Integer.toHexString(type);
} }
@@ -1324,7 +1327,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
} }
if (!DEBUG_CONCISE_TOSTRING || mWindowChangeTypes != 0) { if (!DEBUG_CONCISE_TOSTRING || mWindowChangeTypes != 0) {
builder.append("; WindowChangeTypes: ").append( builder.append("; WindowChangeTypes: ").append(
contentChangeTypesToString(mWindowChangeTypes)); windowChangeTypesToString(mWindowChangeTypes));
} }
super.appendTo(builder); super.appendTo(builder);
if (DEBUG || DEBUG_CONCISE_TOSTRING) { if (DEBUG || DEBUG_CONCISE_TOSTRING) {