summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-10-05 17:30:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-05 17:33:36 -0700
commit020daada9d5311921fe3185c68f083cf4aac18f8 (patch)
tree59a68f2e6fd500ec93f3d1014dbb1ed067efb585 /core
parent5a3322fec3be02cda158a0a9c66be725e4056746 (diff)
parent8d0739da7ff6589101f1dc2d5f579f3bfdefd3b4 (diff)
downloadframeworks_base-020daada9d5311921fe3185c68f083cf4aac18f8.zip
frameworks_base-020daada9d5311921fe3185c68f083cf4aac18f8.tar.gz
frameworks_base-020daada9d5311921fe3185c68f083cf4aac18f8.tar.bz2
Merge "Accessibility focus not cleared on temporary detach." into jb-mr1-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/ViewGroup.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index db1c00a..726fa28 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3912,6 +3912,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* @see #removeDetachedView(View, boolean)
*/
protected void detachViewFromParent(View child) {
+ child.clearAccessibilityFocus();
removeFromArray(indexOfChild(child));
}
@@ -3933,6 +3934,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* @see #removeDetachedView(View, boolean)
*/
protected void detachViewFromParent(int index) {
+ getChildAt(index).clearAccessibilityFocus();
removeFromArray(index);
}