From 7d18dd8f07151262cb7dcbb3f70f4d98d88f2fa0 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 13 Jun 2017 12:29:21 -0700 Subject: [PATCH] Fix bug where TalkBack reads both folder name and hint. In O, TalkBack reads both content description and the hint. We clear the hint when the Folder is named so that TalkBack only reads the Folder name. Bug: 62557038 Change-Id: I222fef2e1ce4a0bc222f0ca7bfb2f24281907188 --- src/com/android/launcher3/folder/Folder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 93c9ea8e3a..0e9d08d968 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -351,13 +351,14 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC @Override public boolean onBackKey() { - mFolderName.setHint(sHintText); // Convert to a string here to ensure that no other state associated with the text field // gets saved. String newTitle = mFolderName.getText().toString(); mInfo.setTitle(newTitle); mLauncher.getModelWriter().updateItemInDatabase(mInfo); + mFolderName.setHint(sDefaultFolderName.contentEquals(newTitle) ? sHintText : null); + Utilities.sendCustomAccessibilityEvent( this, AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, getContext().getString(R.string.folder_renamed, newTitle)); @@ -454,8 +455,10 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC if (!sDefaultFolderName.contentEquals(mInfo.title)) { mFolderName.setText(mInfo.title); + mFolderName.setHint(null); } else { mFolderName.setText(""); + mFolderName.setHint(sHintText); } // In case any children didn't come across during loading, clean up the folder accordingly