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

Commit 82a8f3b7 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 4f38f7a9: am b44ab987: Merge "TextChange transition now uses CharSequence... 

am 4f38f7a9: am b44ab987: Merge "TextChange transition now uses CharSequence instead of String" into klp-dev

* commit '4f38f7a9':
  TextChange transition now uses CharSequence instead of String
parents 2bd9dccc 4f38f7a9

core/java/android/transition/TextChange.java

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

        final TextView view = (TextView) endValues.view;

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

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

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

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

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

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

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

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

        if (!startText.equals(endText)) {

        if (!startText.equals(endText)) {

            view.setText(startText);

            view.setText(startText);

            Animator anim;

            Animator anim;