summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/Fragment.java5
-rw-r--r--core/java/android/app/FragmentManager.java56
2 files changed, 30 insertions, 31 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 56cf399..16d105a 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -16,7 +16,7 @@
package android.app;
-import android.animation.Animatable;
+import android.animation.Animator;
import android.content.ComponentCallbacks;
import android.content.Context;
import android.content.Intent;
@@ -26,7 +26,6 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.util.AndroidRuntimeException;
import android.util.AttributeSet;
-import android.util.Log;
import android.util.SparseArray;
import android.view.ContextMenu;
import android.view.LayoutInflater;
@@ -755,7 +754,7 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
/**
* Called when a fragment loads an animation.
*/
- public Animatable onCreateAnimatable(int transit, boolean enter, int nextAnim) {
+ public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
return null;
}
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 7641f61..4d4f892 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -16,10 +16,10 @@
package android.app;
-import android.animation.Animatable;
-import android.animation.AnimatableInflater;
-import android.animation.PropertyAnimator;
-import android.animation.Sequencer;
+import android.animation.Animator;
+import android.animation.AnimatorInflater;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
import android.content.res.TypedArray;
import android.os.Bundle;
import android.os.Handler;
@@ -248,16 +248,16 @@ final class FragmentManagerImpl implements FragmentManager {
return f;
}
- Animatable loadAnimatable(Fragment fragment, int transit, boolean enter,
+ Animator loadAnimator(Fragment fragment, int transit, boolean enter,
int transitionStyle) {
- Animatable animObj = fragment.onCreateAnimatable(transit, enter,
+ Animator animObj = fragment.onCreateAnimator(transit, enter,
fragment.mNextAnim);
if (animObj != null) {
return animObj;
}
if (fragment.mNextAnim != 0) {
- Animatable anim = AnimatableInflater.loadAnimatable(mActivity, fragment.mNextAnim);
+ Animator anim = AnimatorInflater.loadAnimator(mActivity, fragment.mNextAnim);
if (anim != null) {
return anim;
}
@@ -288,7 +288,7 @@ final class FragmentManagerImpl implements FragmentManager {
return null;
}
- return AnimatableInflater.loadAnimatable(mActivity, anim);
+ return AnimatorInflater.loadAnimator(mActivity, anim);
}
void moveToState(Fragment f, int newState, int transit, int transitionStyle) {
@@ -360,13 +360,13 @@ final class FragmentManagerImpl implements FragmentManager {
if (f.mView != null) {
f.mView.setSaveFromParentEnabled(false);
if (container != null) {
- Animatable anim = loadAnimatable(f, transit, true,
+ Animator anim = loadAnimator(f, transit, true,
transitionStyle);
if (anim != null) {
- if (anim instanceof Sequencer) {
- ((Sequencer)anim).setTarget(f.mView);
- } else if (anim instanceof PropertyAnimator) {
- ((PropertyAnimator)anim).setTarget(f.mView);
+ if (anim instanceof AnimatorSet) {
+ ((AnimatorSet)anim).setTarget(f.mView);
+ } else if (anim instanceof ObjectAnimator) {
+ ((ObjectAnimator)anim).setTarget(f.mView);
}
anim.start();
}
@@ -448,13 +448,13 @@ final class FragmentManagerImpl implements FragmentManager {
}
if (f.mView != null && f.mContainer != null) {
if (mCurState > Fragment.INITIALIZING) {
- Animatable anim = loadAnimatable(f, transit, true,
+ Animator anim = loadAnimator(f, transit, true,
transitionStyle);
if (anim != null) {
- if (anim instanceof Sequencer) {
- ((Sequencer)anim).setTarget(f.mView);
- } else if (anim instanceof PropertyAnimator) {
- ((PropertyAnimator)anim).setTarget(f.mView);
+ if (anim instanceof AnimatorSet) {
+ ((AnimatorSet)anim).setTarget(f.mView);
+ } else if (anim instanceof ObjectAnimator) {
+ ((ObjectAnimator)anim).setTarget(f.mView);
}
anim.start();
}
@@ -588,13 +588,13 @@ final class FragmentManagerImpl implements FragmentManager {
if (!fragment.mHidden) {
fragment.mHidden = true;
if (fragment.mView != null) {
- Animatable anim = loadAnimatable(fragment, transition, true,
+ Animator anim = loadAnimator(fragment, transition, true,
transitionStyle);
if (anim != null) {
- if (anim instanceof Sequencer) {
- ((Sequencer)anim).setTarget(fragment.mView);
- } else if (anim instanceof PropertyAnimator) {
- ((PropertyAnimator)anim).setTarget(fragment.mView);
+ if (anim instanceof AnimatorSet) {
+ ((AnimatorSet)anim).setTarget(fragment.mView);
+ } else if (anim instanceof ObjectAnimator) {
+ ((ObjectAnimator)anim).setTarget(fragment.mView);
}
anim.start();
}
@@ -612,13 +612,13 @@ final class FragmentManagerImpl implements FragmentManager {
if (fragment.mHidden) {
fragment.mHidden = false;
if (fragment.mView != null) {
- Animatable anim = loadAnimatable(fragment, transition, true,
+ Animator anim = loadAnimator(fragment, transition, true,
transitionStyle);
if (anim != null) {
- if (anim instanceof Sequencer) {
- ((Sequencer)anim).setTarget(fragment.mView);
- } else if (anim instanceof PropertyAnimator) {
- ((PropertyAnimator)anim).setTarget(fragment.mView);
+ if (anim instanceof AnimatorSet) {
+ ((AnimatorSet)anim).setTarget(fragment.mView);
+ } else if (anim instanceof ObjectAnimator) {
+ ((ObjectAnimator)anim).setTarget(fragment.mView);
}
anim.start();
}
generated by cgit v1.1 at 2025-08-17 18:47:08 +0000