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

Commit 12b2dc23 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Holo theme for error popups in TextViews." into honeycomb

parents 10f27c5a 5f059e46

core/java/android/widget/TextView.java

+17 −2
Original line number Diff line number Diff line
@@ -3508,6 +3508,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    private static class ErrorPopup extends PopupWindow {

        private boolean mAbove = false;

        private final TextView mView;

        private int mPopupInlineErrorBackgroundId = 0;

        private int mPopupInlineErrorAboveBackgroundId = 0;



        ErrorPopup(TextView v, int width, int height) {

            super(v, width, height);
@@ -3518,10 +3520,23 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            mAbove = above;



            if (above) {

                mView.setBackgroundResource(com.android.internal.R.drawable.popup_inline_error_above);

                mPopupInlineErrorAboveBackgroundId =

                    getResourceId(mPopupInlineErrorAboveBackgroundId, com.android.internal.R.styleable.Theme_errorMessageAboveBackground);

            } else {

                mView.setBackgroundResource(com.android.internal.R.drawable.popup_inline_error);

                mPopupInlineErrorBackgroundId =

                    getResourceId(mPopupInlineErrorBackgroundId, com.android.internal.R.styleable.Theme_errorMessageBackground);

            }



            mView.setBackgroundResource(above ? mPopupInlineErrorAboveBackgroundId : mPopupInlineErrorBackgroundId);

        }



        private int getResourceId(int currentId, int index) {

            if (currentId == 0) {

                TypedArray styledAttributes = mView.getContext().obtainStyledAttributes(R.styleable.Theme);

                currentId = styledAttributes.getResourceId(index, 0);

                styledAttributes.recycle();

            }

            return currentId;

        }



        @Override

core/res/res/drawable-mdpi/popup_inline_error_above_holo_dark.9.png

0 → 100644
+1.43 KiB
Loading image diff...

core/res/res/drawable-mdpi/popup_inline_error_above_holo_light.9.png

0 → 100644
+1.41 KiB
Loading image diff...

core/res/res/drawable-mdpi/popup_inline_error_holo_dark.9.png

0 → 100755
+1.38 KiB
Loading image diff...

core/res/res/drawable-mdpi/popup_inline_error_holo_light.9.png

0 → 100755
+1.38 KiB
Loading image diff...