commit 91e270257ac706eef99622f14aef02958a54e4c9
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 17 23:05:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 23:05:32 2020 +0000
tree 2c0a66074591abfe90feb8d9d2160a5113914dc5
parent 80eb8e041a128fc00a77fcb53049ecc6f457c345
parent 171b2ae9174251788fc8386b4bcfb996233582de

Merge "Focuses on folder container for Accessibility when no contents to focus on." into ub-launcher3-rvc-qpr-dev am: 4c7ced91c0 am: 171b2ae917

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12146163

Change-Id: I059c80cc120ce112576dede464ee49238c1ff639

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) {