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

Notification for changed subtree in accessibility mode not fired properly.

Browse Source 
We fire notifications that the a view subtree changed for accessibility.
In some cases the notifications were fired if accessibility is not
enabled. This is now fixed. Also the runnable for making the recurring
subtree change was not dequeued if it was pending but we received a
request which we decided to run immediately.

bug:9337912

Change-Id: I27401b3d11f81c653e8761a704ee530263b08c3a
This commit is contained in:
Svetoslav
2013-06-10 12:51:09 -07:00
parent be4e6aaa02
commit 00dbe81fea
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7024,7 +7024,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @hide
*/
private void notifySubtreeAccessibilityStateChangedIfNeeded() {
public void notifySubtreeAccessibilityStateChangedIfNeeded() {
if (!AccessibilityManager.getInstance(mContext).isEnabled()) {
return;
}
@@ -18867,6 +18867,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
final long minEventIntevalMillis =
ViewConfiguration.getSendRecurringAccessibilityEventsInterval();
if (timeSinceLastMillis >= minEventIntevalMillis) {
removeCallbacks(this);
run();
} else {
postDelayed(this, minEventIntevalMillis - timeSinceLastMillis);

4
core/java/android/view/ViewGroup.java
View File

@@ -3595,7 +3595,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
if (child.isImportantForAccessibility() && child.getVisibility() != View.GONE) {
childAccessibilityStateChanged(child);
notifySubtreeAccessibilityStateChangedIfNeeded();
}
}
@@ -3838,7 +3838,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
onViewRemoved(view);
if (view.isImportantForAccessibility() && view.getVisibility() != View.GONE) {
childAccessibilityStateChanged(view);
notifySubtreeAccessibilityStateChangedIfNeeded();
}
}

11
core/java/android/view/ViewRootImpl.java
View File

@@ -6397,12 +6397,10 @@ public final class ViewRootImpl implements ViewParent,
public void run() {
mLastEventTimeMillis = SystemClock.uptimeMillis();
if (AccessibilityManager.getInstance(mContext).isEnabled()) {
AccessibilityEvent event = AccessibilityEvent.obtain();
event.setEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
event.setContentChangeType(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
mSource.sendAccessibilityEventUnchecked(event);
}
AccessibilityEvent event = AccessibilityEvent.obtain();
event.setEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
event.setContentChangeType(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
mSource.sendAccessibilityEventUnchecked(event);
mSource.resetSubtreeAccessibilityStateChanged();
mSource = null;
}
@@ -6417,6 +6415,7 @@ public final class ViewRootImpl implements ViewParent,
final long minEventIntevalMillis =
ViewConfiguration.getSendRecurringAccessibilityEventsInterval();
if (timeSinceLastMillis >= minEventIntevalMillis) {
mSource.removeCallbacks(this);
run();
} else {
mSource.postDelayed(this, minEventIntevalMillis - timeSinceLastMillis);

2
core/java/android/widget/AdapterView.java
View File

@@ -1033,7 +1033,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
checkSelectionChanged();
}
childAccessibilityStateChanged(this);
notifySubtreeAccessibilityStateChangedIfNeeded();
}
void checkSelectionChanged() {