From 25283f0f4590b856a778fd8436f81d8f0ceab60f Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Mon, 30 Dec 2024 13:04:30 -0800 Subject: [PATCH] Fix for bug where Talkback announce Folder:null Bug: 385046797 Test: Verified this works locally. Flag: EXEMPT bug fix Change-Id: I9ad23f351df078b6bd40ff861e13b9109bfa8993 --- res/values/strings.xml | 2 ++ src/com/android/launcher3/folder/FolderIcon.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6f293b612b..501e650e53 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -308,6 +308,8 @@ Folder: %1$s, %2$d items Folder: %1$s, %2$d or more items + + Unnamed folder diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index de1bcc34db..2481a1a01b 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -816,6 +816,10 @@ public class FolderIcon extends FrameLayout implements FolderListener, FloatingI * Returns a formatted accessibility title for folder */ public String getAccessiblityTitle(CharSequence title) { + if (title == null) { + // Avoids "Talkback -> Folder: null" announcement. + title = getContext().getString(R.string.unnamed_folder); + } int size = mInfo.getContents().size(); if (size < MAX_NUM_ITEMS_IN_PREVIEW) { return getContext().getString(R.string.folder_name_format_exact, title, size);