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

Commit b44ab987 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "TextChange transition now uses CharSequence instead of String" into klp-dev

parents 23f31a1c 2a83181b

core/java/android/transition/TextChange.java

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ public class TextChange extends Transition { 
        final TextView view = (TextView) endValues.view;

        Map<String, Object> startVals = startValues.values;

        Map<String, Object> endVals = endValues.values;

        final String startText = (String) startVals.get(PROPNAME_TEXT);

        final String endText = (String) endVals.get(PROPNAME_TEXT);

        final CharSequence startText = (CharSequence) startVals.get(PROPNAME_TEXT);

        final CharSequence endText = (CharSequence) endVals.get(PROPNAME_TEXT);

        if (!startText.equals(endText)) {

            view.setText(startText);

            Animator anim;