commit b44ab9872a0b6d325a38c79dfcae81ff5fc8622e
author Chet Haase <chet@google.com> Mon Sep 09 17:36:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 17:36:13 2013 +0000
tree 4a6b5ba2aed45c87827f5af391c365230f3c4de1
parent 23f31a1c4ed313790921427df82f36960d9e9706
parent 2a83181bd1a025eb8a1763b11ae9ba33925625b3

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

core/java/android/transition/TextChange.java

diff --git a/core/java/android/transition/TextChange.java b/core/java/android/transition/TextChange.java
index 1b26942..4f14d46 100644
--- a/core/java/android/transition/TextChange.java
+++ b/core/java/android/transition/TextChange.java
@@ -143,8 +143,8 @@
         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;