diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-06-19 20:26:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-19 20:26:20 +0000 |
| commit | 1991450cb0aa429f1f5d15b11057058c98ec5eed (patch) | |
| tree | d97a55f3c109cf10e49a9fa60234af7006cd1a29 /src/com/android/launcher3/folder | |
| parent | 6691a6b75c6bc9884a7966b186301b2cc56bdc55 (diff) | |
| parent | 7d18dd8f07151262cb7dcbb3f70f4d98d88f2fa0 (diff) | |
| download | android_packages_apps_Trebuchet-1991450cb0aa429f1f5d15b11057058c98ec5eed.tar.gz android_packages_apps_Trebuchet-1991450cb0aa429f1f5d15b11057058c98ec5eed.tar.bz2 android_packages_apps_Trebuchet-1991450cb0aa429f1f5d15b11057058c98ec5eed.zip | |
Fix bug where TalkBack reads both folder name and hint.
am: 7d18dd8f07
Change-Id: Iedf8f4f8c4f9063372afb57ca1cf7462a15d7223
Diffstat (limited to 'src/com/android/launcher3/folder')
| -rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 9e3055036..5794004b9 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -356,13 +356,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)); @@ -459,8 +460,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 |