LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new Quantum Paper Activity Transitions API.

Browse Source 
Change-Id: Ia487e02e8cb7a90bd14b0e09392eddac5c1a06ec
This commit is contained in:
George Mount
2014-02-26 13:05:43 -08:00
parent f46308ba8c
commit f93d490356
6 changed files with 28 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
View File

@@ -22,17 +22,10 @@ import android.app.ActivityOptions;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.transition.MoveImage;
import android.transition.Slide;
import android.transition.TransitionManager;
import android.transition.TransitionSet;
import android.util.ArrayMap;
import android.util.Pair;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import java.util.Random;
/**
*
*/
@@ -42,8 +35,6 @@ public class ActivityTransition extends Activity {
private static final String KEY_ID = "ViewTransitionValues:id";
private Random mRandom = new Random();
private ImageView mHero;
public static final int[] DRAWABLES = {
@@ -100,20 +91,9 @@ public class ActivityTransition extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_CONTENT_TRANSITIONS);
getWindow().setAllowOverlappingEnterTransition(true);
getWindow().setAllowOverlappingExitTransition(true);
getWindow().setBackgroundDrawable(new ColorDrawable(randomColor()));
setContentView(R.layout.image_block);
setupHero();
TransitionManager transitionManager = getContentTransitionManager();
TransitionSet transitions = new TransitionSet();
Slide slide = new Slide();
slide.setDuration(600);
transitions.addTransition(slide);
transitions.addTransition(new MoveImage());
transitionManager.setTransition(getContentScene(), transitions);
transitionManager.setExitTransition(getContentScene(), transitions);
}
private void setupHero() {
@@ -121,9 +101,12 @@ public class ActivityTransition extends Activity {
mHero = null;
if (name != null) {
mHero = (ImageView) findViewById(getIdForKey(name));
ArrayMap<String, String> sharedElementsMap = new ArrayMap<String, String>();
sharedElementsMap.put("hero", mHero.getSharedElementName());
getWindow().mapTransitionTargets(sharedElementsMap);
setActivityTransitionListener(new ActivityOptions.ActivityTransitionListener() {
@Override
public Pair<View, String>[] getSharedElementsMapping() {
return new Pair[] { Pair.create((View)mHero, "hero") };
}
});
}
}
@@ -132,14 +115,14 @@ public class ActivityTransition extends Activity {
Intent intent = new Intent(this, ActivityTransitionDetails.class);
intent.putExtra(KEY_ID, v.getSharedElementName());
ActivityOptions activityOptions
= ActivityOptions.makeSceneTransitionAnimation(mHero, "hero");
= ActivityOptions.makeSceneTransitionAnimation(getWindow(), mHero, "hero");
startActivity(intent, activityOptions.toBundle());
}
private int randomColor() {
int red = mRandom.nextInt(128);
int green = mRandom.nextInt(128);
int blue = mRandom.nextInt(128);
private static int randomColor() {
int red = (int)(Math.random() * 128);
int green = (int)(Math.random() * 128);
int blue = (int)(Math.random() * 128);
return 0xFF000000 | (red << 16) | (green << 8) | blue;
}
}

34
samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransitionDetails.java
View File

@@ -23,16 +23,9 @@ import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.transition.MoveImage;
import android.transition.Slide;
import android.transition.TransitionManager;
import android.transition.TransitionSet;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import java.util.Random;
/**
*
*/
@@ -42,8 +35,6 @@ public class ActivityTransitionDetails extends Activity {
private static final String KEY_ID = "ViewTransitionValues:id";
private Random mRandom = new Random();
private int mImageResourceId = R.drawable.ducky;
private String mName = "ducky";
@@ -51,23 +42,10 @@ public class ActivityTransitionDetails extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_CONTENT_TRANSITIONS);
getWindow().setAllowOverlappingEnterTransition(false);
getWindow().setAllowOverlappingExitTransition(true);
getWindow().setBackgroundDrawable(new ColorDrawable(randomColor()));
setContentView(R.layout.image_details);
ImageView titleImage = (ImageView) findViewById(R.id.titleImage);
titleImage.setImageDrawable(getHeroDrawable());
TransitionManager transitionManager = getContentTransitionManager();
TransitionSet transitions = new TransitionSet();
Slide slide = new Slide();
slide.setDuration(600);
transitions.addTransition(slide);
transitions.addTransition(new MoveImage());
transitionManager.setTransition(getContentScene(), transitions);
transitionManager.setExitTransition(getContentScene(), transitions);
}
private Drawable getHeroDrawable() {
@@ -83,15 +61,15 @@ public class ActivityTransitionDetails extends Activity {
public void clicked(View v) {
Intent intent = new Intent(this, ActivityTransition.class);
intent.putExtra(KEY_ID, mName);
ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(v, "hero");
ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(getWindow(),
v, "hero");
startActivity(intent, activityOptions.toBundle());
}
private int randomColor() {
int red = mRandom.nextInt(128);
int green = mRandom.nextInt(128);
int blue = mRandom.nextInt(128);
private static int randomColor() {
int red = (int)(Math.random() * 128);
int green = (int)(Math.random() * 128);
int blue = (int)(Math.random() * 128);
return 0xFF000000 | (red << 16) | (green << 8) | blue;
}
}