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

Commit f659a56c authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev

parents 220eef4a bb98ebd6

core/java/android/widget/CalendarViewLegacyDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ class CalendarViewLegacyDelegate extends CalendarView.AbstractCalendarViewDelega 
        for (int i = 1, count = mDayNamesHeader.getChildCount(); i < count; i++) {

            label = (TextView) mDayNamesHeader.getChildAt(i);

            if (mWeekDayTextAppearanceResId > -1) {

                label.setTextAppearance(mContext, mWeekDayTextAppearanceResId);

                label.setTextAppearance(mWeekDayTextAppearanceResId);

            }

            if (i < mDaysPerWeek + 1) {

                label.setText(mDayNamesShort[i - 1]);

core/java/android/widget/Editor.java

+1 −1
Original line number Diff line number Diff line
@@ -2055,7 +2055,7 @@ public class Editor { 
        shadowView.setText(text);

        shadowView.setTextColor(mTextView.getTextColors());



        shadowView.setTextAppearance(mTextView.getContext(), R.styleable.Theme_textAppearanceLarge);

        shadowView.setTextAppearance(R.styleable.Theme_textAppearanceLarge);

        shadowView.setGravity(Gravity.CENTER);



        shadowView.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,

core/java/android/widget/Toolbar.java

+4 −4
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ public class Toolbar extends ViewGroup { 
                mTitleTextView.setSingleLine();

                mTitleTextView.setEllipsize(TextUtils.TruncateAt.END);

                if (mTitleTextAppearance != 0) {

                    mTitleTextView.setTextAppearance(context, mTitleTextAppearance);

                    mTitleTextView.setTextAppearance(mTitleTextAppearance);

                }

                if (mTitleTextColor != 0) {

                    mTitleTextView.setTextColor(mTitleTextColor);
@@ -644,7 +644,7 @@ public class Toolbar extends ViewGroup { 
                mSubtitleTextView.setSingleLine();

                mSubtitleTextView.setEllipsize(TextUtils.TruncateAt.END);

                if (mSubtitleTextAppearance != 0) {

                    mSubtitleTextView.setTextAppearance(context, mSubtitleTextAppearance);

                    mSubtitleTextView.setTextAppearance(mSubtitleTextAppearance);

                }

                if (mSubtitleTextColor != 0) {

                    mSubtitleTextView.setTextColor(mSubtitleTextColor);
@@ -670,7 +670,7 @@ public class Toolbar extends ViewGroup { 
    public void setTitleTextAppearance(Context context, @StyleRes int resId) {

        mTitleTextAppearance = resId;

        if (mTitleTextView != null) {

            mTitleTextView.setTextAppearance(context, resId);

            mTitleTextView.setTextAppearance(resId);

        }

    }
@@ -681,7 +681,7 @@ public class Toolbar extends ViewGroup { 
    public void setSubtitleTextAppearance(Context context, @StyleRes int resId) {

        mSubtitleTextAppearance = resId;

        if (mSubtitleTextView != null) {

            mSubtitleTextView.setTextAppearance(context, resId);

            mSubtitleTextView.setTextAppearance(resId);

        }

    }

core/java/com/android/internal/widget/ActionBarContextView.java

+2 −2
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi 
            mTitleView = (TextView) mTitleLayout.findViewById(R.id.action_bar_title);

            mSubtitleView = (TextView) mTitleLayout.findViewById(R.id.action_bar_subtitle);

            if (mTitleStyleRes != 0) {

                mTitleView.setTextAppearance(mContext, mTitleStyleRes);

                mTitleView.setTextAppearance(mTitleStyleRes);

            }

            if (mSubtitleStyleRes != 0) {

                mSubtitleView.setTextAppearance(mContext, mSubtitleStyleRes);

                mSubtitleView.setTextAppearance(mSubtitleStyleRes);

            }

        }

core/java/com/android/internal/widget/ActionBarView.java

+2 −2
Original line number Diff line number Diff line
@@ -813,14 +813,14 @@ public class ActionBarView extends AbsActionBarView implements DecorToolbar { 
            mSubtitleView = (TextView) mTitleLayout.findViewById(R.id.action_bar_subtitle);



            if (mTitleStyleRes != 0) {

                mTitleView.setTextAppearance(mContext, mTitleStyleRes);

                mTitleView.setTextAppearance(mTitleStyleRes);

            }

            if (mTitle != null) {

                mTitleView.setText(mTitle);

            }



            if (mSubtitleStyleRes != 0) {

                mSubtitleView.setTextAppearance(mContext, mSubtitleStyleRes);

                mSubtitleView.setTextAppearance(mSubtitleStyleRes);

            }

            if (mSubtitle != null) {

                mSubtitleView.setText(mSubtitle);