Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d18dd8f authored by Jon Miranda's avatar Jon Miranda Committed by Jonathan Miranda
Browse files

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
parent 5098e36f

src/com/android/launcher3/folder/Folder.java

+4 −1
Original line number Diff line number Diff line
@@ -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