commit 4c7ced91c0eca971414e3f3ed4f224855b8b93c9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 14 16:41:25 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 16:41:25 2020 +0000
tree 11883ba24488e44a1993b5b0d6e542260b5b24d2
parent ec78aef4fc9fed2eaa0f1a391760d16b8db09dbe
parent f865551ff00631b89378bd2a83727d58ec6761a0

Merge "Focuses on folder container for Accessibility when no contents to focus on." into ub-launcher3-rvc-qpr-dev

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 1c18402..de2b5da 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -741,7 +741,8 @@
 
     @Override
     protected View getAccessibilityInitialFocusView() {
-        return mContent.getFirstItem();
+        View firstItem = mContent.getFirstItem();
+        return firstItem != null ? firstItem : super.getAccessibilityInitialFocusView();
     }
 
     private void closeComplete(boolean wasAnimated) {