aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where TalkBack reads both folder name and hint.

Browse Source 
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
This commit is contained in:
Jon Miranda
2017-06-13 12:29:21 -07:00
committed by Jonathan Miranda
parent 5098e36f01
commit 7d18dd8f07
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/folder/Folder.java
View File

@@ -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