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

Commit 98e998ce authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 3b12d74e: am d211767f: Merge "Announce changes in keyguard message, e.g.... 

am 3b12d74e: am d211767f: Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev

* commit '3b12d74e':
  Announce changes in keyguard message, e.g. bad unlock pattern.
parents bc88e5f2 3b12d74e

policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java

+3 −0
Original line number Diff line number Diff line
@@ -42,11 +42,13 @@ public class KeyguardNavigationManager { 


    public void setMessage(CharSequence msg) {

        mMessageArea.setText(msg);

        mMessageArea.announceForAccessibility(mMessageArea.getText());

    }



    public void setMessage(int resId) {

        if (resId != 0) {

            mMessageArea.setText(resId);

            mMessageArea.announceForAccessibility(mMessageArea.getText());

        } else {

            mMessageArea.setText("");

        }
@@ -55,6 +57,7 @@ public class KeyguardNavigationManager { 
    public void setMessage(int resId, Object... formatArgs) {

        if (resId != 0) {

            mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs));

            mMessageArea.announceForAccessibility(mMessageArea.getText());

        } else {

            mMessageArea.setText("");

        }