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

Commit a97f5b8c authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card... 

am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev

* commit '9d82d324':
  Fix bug #7457897 Error icons are not shown in credit card entry form
parents 81b74a61 9d82d324

core/java/android/widget/Editor.java

+5 −5
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ public class Editor { 
        mErrorWasChanged = true;



        if (mError == null) {

            setErrorIcon(null);

            if (mErrorPopup != null) {

                if (mErrorPopup.isShowing()) {

                    mErrorPopup.dismiss();
@@ -299,10 +300,11 @@ public class Editor { 
                mErrorPopup = null;

            }



            setErrorIcon(null);

        } else if (mTextView.isFocused()) {

            showError();

        } else {

            setErrorIcon(icon);

            if (mTextView.isFocused()) {

                showError();

            }

        }

    }
@@ -321,8 +323,6 @@ public class Editor { 
            if (mErrorPopup.isShowing()) {

                mErrorPopup.dismiss();

            }



            setErrorIcon(null);

        }



        mShowErrorAfterAttach = false;