diff options
| author | Chet Haase <chet@google.com> | 2013-09-27 00:26:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 00:26:22 +0000 |
| commit | 033837dd6bf32b33d9a67d340efd167f94bf80cf (patch) | |
| tree | bb60884d841a901846d0a680aab16eee8992b27e /core/java/com | |
| parent | adf149029f701464c66cc5cacbbbc649c1319bcd (diff) | |
| parent | b7a7fc9d233bad507ce893882352618b13647058 (diff) | |
| download | frameworks_base-033837dd6bf32b33d9a67d340efd167f94bf80cf.zip frameworks_base-033837dd6bf32b33d9a67d340efd167f94bf80cf.tar.gz frameworks_base-033837dd6bf32b33d9a67d340efd167f94bf80cf.tar.bz2 | |
Merge "Make fading transitions work better" into klp-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/transition/ActionBarTransition.java | 6 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/java/com/android/internal/transition/ActionBarTransition.java b/core/java/com/android/internal/transition/ActionBarTransition.java index 8beae8c..c1065e7 100644 --- a/core/java/com/android/internal/transition/ActionBarTransition.java +++ b/core/java/com/android/internal/transition/ActionBarTransition.java @@ -19,7 +19,7 @@ package com.android.internal.transition; import android.transition.ChangeBounds; import android.transition.Fade; -import android.transition.TextChange; +import android.transition.ChangeText; import android.transition.Transition; import android.transition.TransitionManager; import android.transition.TransitionSet; @@ -35,8 +35,8 @@ public class ActionBarTransition { static { if (TRANSITIONS_ENABLED) { - final TextChange tc = new TextChange(); - tc.setChangeBehavior(TextChange.CHANGE_BEHAVIOR_OUT_IN); + final ChangeText tc = new ChangeText(); + tc.setChangeBehavior(ChangeText.CHANGE_BEHAVIOR_OUT_IN); final TransitionSet inner = new TransitionSet(); inner.addTransition(tc).addTransition(new ChangeBounds()); final TransitionSet tg = new TransitionSet(); diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index a6566d5..b5d74e8 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -29,12 +29,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.Layout; import android.text.TextUtils; -import android.transition.ChangeBounds; -import android.transition.Fade; -import android.transition.TextChange; -import android.transition.Transition; -import android.transition.TransitionManager; -import android.transition.TransitionSet; import android.util.AttributeSet; import android.view.CollapsibleActionView; import android.view.Gravity; |