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

Commit cc38306d authored by alanv's avatar alanv
Browse files

Only speak key label after checking for password obscure flag.

Bug: 6523222
Change-Id: Ic737c4ce135d869a3422b1ebbea0a845c71b1699
parent 282adf73
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ public class KeyCodeDescriptionMapper {
            if (mKeyLabelMap.containsKey(label)) {
                return context.getString(mKeyLabelMap.get(label));
            }

            // Otherwise, return the label.
            return key.mLabel;
        }

        // Just attempt to speak the description.
@@ -229,6 +226,8 @@ public class KeyCodeDescriptionMapper {
            return context.getString(mKeyCodeMap.get(code));
        } else if (isDefinedNonCtrl) {
            return Character.toString((char) code);
        } else if (!TextUtils.isEmpty(key.mLabel)) {
            return key.mLabel;
        } else {
            return context.getString(R.string.spoken_description_unknown, code);
        }