summaryrefslogtreecommitdiffstats
path: root/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-08-26 14:20:16 -0700
committerChet Haase <chet@google.com>2013-09-04 14:46:38 -0700
commitd82c8ac4db7091d2e976af4c89a1734465d20cd2 (patch)
treea3ccb4d7a4325582dfe028030e4ca2d38ba4c2be /tests/TransitionTests/src/com/android/transitiontests/Demo3.java
parent2a59f3f24076d96cbb10e1c00c3264dec43f19b1 (diff)
downloadframeworks_base-d82c8ac4db7091d2e976af4c89a1734465d20cd2.zip
frameworks_base-d82c8ac4db7091d2e976af4c89a1734465d20cd2.tar.gz
frameworks_base-d82c8ac4db7091d2e976af4c89a1734465d20cd2.tar.bz2
Transition API changes from API council recommendations
Issue #10460684 KLP API Review: android.view.transition and android.animation Issue #10570740 Transitions: inflate transition targets from xml Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
Diffstat (limited to 'tests/TransitionTests/src/com/android/transitiontests/Demo3.java')
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo3.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo3.java b/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
index b8daff5..0ffa1f5 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
@@ -17,14 +17,14 @@ package com.android.transitiontests;
import android.app.Activity;
import android.os.Bundle;
+import android.transition.ChangeBounds;
import android.view.View;
import android.view.ViewGroup;
-import android.view.transition.Fade;
-import android.view.transition.Move;
-import android.view.transition.Recolor;
-import android.view.transition.Scene;
-import android.view.transition.TransitionGroup;
-import android.view.transition.TransitionManager;
+import android.transition.Fade;
+import android.transition.Recolor;
+import android.transition.Scene;
+import android.transition.TransitionSet;
+import android.transition.TransitionManager;
public class Demo3 extends Activity {
@@ -41,11 +41,11 @@ public class Demo3 extends Activity {
View container = (View) findViewById(R.id.container);
mSceneRoot = (ViewGroup) container.getParent();
- mSearchScreen = new Scene(mSceneRoot, R.layout.search_screen, this);
- mResultsScreen = new Scene(mSceneRoot, R.layout.results_screen, this);
+ mSearchScreen = Scene.getSceneForLayout(mSceneRoot, R.layout.search_screen, this);
+ mResultsScreen = Scene.getSceneForLayout(mSceneRoot, R.layout.results_screen, this);
- TransitionGroup transition = new TransitionGroup();
- transition.addTransitions(new Fade(), new Move(), new Recolor());
+ TransitionSet transition = new TransitionSet();
+ transition.addTransition(new Fade()).addTransition(new ChangeBounds()).addTransition(new Recolor());
mTransitionManager = new TransitionManager();
mTransitionManager.setTransition(mSearchScreen, transition);