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

Merge "A11y isHeading takes old API into account" into pi-dev

Browse Source 
am: c364536807

Change-Id: Id5479bef4a2b173d8388e016a117a68bbe1b062f
This commit is contained in:
Phil Weaver
2018-04-25 10:47:10 -07:00
committed by android-build-merger
parent 05c4753c0a c364536807
commit e22eb1d0a3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -2413,11 +2413,16 @@ public class AccessibilityNodeInfo implements Parcelable {
/**
* Returns whether node represents a heading.
* <p><strong>Note:</strong> Returns {@code true} if either {@link #setHeading(boolean)}
* marks this node as a heading or if the node has a {@link CollectionItemInfo} that marks
* it as such, to accomodate apps that use the now-deprecated API.</p>
*
* @return {@code true} if the node is a heading, {@code false} otherwise.
*/
public boolean isHeading() {
return getBooleanProperty(BOOLEAN_PROPERTY_IS_HEADING);
if (getBooleanProperty(BOOLEAN_PROPERTY_IS_HEADING)) return true;
CollectionItemInfo itemInfo = getCollectionItemInfo();
return ((itemInfo != null) && itemInfo.mHeading);
}
/**