Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chet Haase
2013-09-09 17:36:13 +00:00
committed by Android (Google) Code Review
parent 23f31a1c4e 2a83181bd1
commit b44ab9872a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/transition/TextChange.java
View File

@@ -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;