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

am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev

Browse Source 
* commit '90b10f89d7c1dd217f07f4b51ed8e5c93deccc52':
  Fix TechChange's assumption about TextView targets
This commit is contained in:
Chet Haase
2013-09-12 12:44:22 -07:00
committed by Android Git Automerger
parent db0e1cf14a 90b10f89d7
commit 79f245e472
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,14 +137,17 @@ public class TextChange extends Transition {
@Override
public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
TransitionValues endValues) {
if (startValues == null || endValues == null || !(endValues.view instanceof TextView)) {
if (startValues == null || endValues == null ||
!(startValues.view instanceof TextView) || !(endValues.view instanceof TextView)) {
return null;
}
final TextView view = (TextView) endValues.view;
Map<String, Object> startVals = startValues.values;
Map<String, Object> endVals = endValues.values;
final CharSequence startText = (CharSequence) startVals.get(PROPNAME_TEXT);
final CharSequence endText = (CharSequence) endVals.get(PROPNAME_TEXT);
final CharSequence startText = startVals.get(PROPNAME_TEXT) != null ?
(CharSequence) startVals.get(PROPNAME_TEXT) : "";
final CharSequence endText = endVals.get(PROPNAME_TEXT) != null ?
(CharSequence) endVals.get(PROPNAME_TEXT) : "";
if (!startText.equals(endText)) {
view.setText(startText);
Animator anim;