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

Merge "Make pane logic consistent with documentation" into tm-dev

Browse Source
This commit is contained in:
Sally Yuen
2022-02-25 17:47:14 +00:00
committed by Android (Google) Code Review
parent cafcc80f5e 4e8545b0b5
commit 9178d29c98
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/view/View.java
View File

@@ -8226,9 +8226,25 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
public void setAccessibilityPaneTitle(@Nullable CharSequence accessibilityPaneTitle) {
if (!TextUtils.equals(accessibilityPaneTitle, mAccessibilityPaneTitle)) {
boolean currentPaneTitleEmpty = mAccessibilityPaneTitle == null;
boolean newPaneTitleEmpty = accessibilityPaneTitle == null;
mAccessibilityPaneTitle = accessibilityPaneTitle;
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_TITLE);
// Make explicitly important as nulled titles need to be important for DISAPPEARED
// events.
if (mAccessibilityPaneTitle != null
&& getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
}
if (currentPaneTitleEmpty) {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_APPEARED);
} else if (newPaneTitleEmpty) {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_DISAPPEARED);
} else {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_TITLE);
}
}
}
@@ -14168,9 +14184,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
// Changes to views with a pane title count as window state changes, as the pane title
// marks them as significant parts of the UI.
// marks them as significant parts of the UI. A visible view with a nulled title may send
// a disappeared event.
if ((changeType != AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE)
&& isAccessibilityPane()) {
&& (isAccessibilityPane()
|| (changeType == AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_DISAPPEARED)
&& isAggregatedVisible())) {
// If the pane isn't visible, content changed events are sufficient unless we're
// reporting that the view just disappeared
if ((isAggregatedVisible())

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

@@ -592,6 +592,11 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
/**
* Change type for {@link #TYPE_WINDOW_STATE_CHANGED} event:
* The node's pane title changed.
* <p>
* If this makes the pane appear, {@link #CONTENT_CHANGE_TYPE_PANE_APPEARED} is sent
* instead. If this makes the pane disappear, {@link #CONTENT_CHANGE_TYPE_PANE_DISAPPEARED}
* is sent.
*
*/
public static final int CONTENT_CHANGE_TYPE_PANE_TITLE = 0x00000008;