From b23e4f498742f2ec6c7fd1e369e0a3a7812c8a9e Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Tue, 6 Jun 2017 09:50:08 -0700 Subject: [PATCH] Don't report focusableViewAvailable on add This reverts a part of 2ae1bf568b68ea18431ab10aceeff3ec62aedb7b RecyclerView relies on the old behavior. Will un-revert this (with targetSdk check) once we have a solution for RecyclerView Bug: 38352147 Test: RecyclerView Focus tests now pass Change-Id: I7b0dfda295cd75e407bbd39a948b5585f8ed6e08 --- core/java/android/view/ViewGroup.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 8637593b38be0..4b79b8c5be9a5 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -4936,9 +4936,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager needGlobalAttributesUpdate(true); } ai.mKeepScreenOn = lastKeepOn; - if (!childHasFocus && child.hasFocusable()) { - focusableViewAvailable(child); - } } if (child.isLayoutDirectionInherited()) {