diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 769129c1c..d8a85a7af 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1295,7 +1295,7 @@
 
         <activity android:name=".animation.ActivityTransition"
                 android:label="Animation/Activity Transition"
-                android:enabled="@bool/atLeastHoneycomb"
+                android:enabled="@bool/atLeastLRelease"
                 android:theme="@style/ActivityTransitionTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1305,7 +1305,7 @@
 
         <activity android:name=".animation.ActivityTransitionDetails"
                 android:label="Animation/Details of a specific thingy"
-                android:enabled="@bool/atLeastHoneycomb"
+                android:enabled="@bool/atLeastLRelease"
                 android:theme="@style/ActivityTransitionTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/samples/ApiDemos/res/values-v19/styles.xml b/samples/ApiDemos/res/values-v19/styles.xml
index 33a747220..c0bd00ba3 100644
--- a/samples/ApiDemos/res/values-v19/styles.xml
+++ b/samples/ApiDemos/res/values-v19/styles.xml
@@ -26,10 +26,4 @@
     <!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
     <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.DialogWhenLarge">
     </style>
-
-    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>
-    </style>
 </resources>
diff --git a/samples/ApiDemos/res/values-v20/styles.xml b/samples/ApiDemos/res/values-v20/styles.xml
index 8307228f3..e454942fb 100644
--- a/samples/ApiDemos/res/values-v20/styles.xml
+++ b/samples/ApiDemos/res/values-v20/styles.xml
@@ -26,10 +26,4 @@
     <!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
     <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
     </style>
-
-    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum.Light">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>
-    </style>
 </resources>
diff --git a/samples/ApiDemos/res/values/styles.xml b/samples/ApiDemos/res/values/styles.xml
index 3e07dfa7f..6c63d542f 100644
--- a/samples/ApiDemos/res/values/styles.xml
+++ b/samples/ApiDemos/res/values/styles.xml
@@ -120,10 +120,14 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="ActivityTransitionTheme" parent="android:style/Theme.Holo">
-        <item name="android:windowIsTranslucent">true</item>
-	      <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>
+    <style name="ActivityTransitionTheme" parent="android:Theme.Quantum">
+	<item name="android:windowEnterTransition">@transition/explode</item>
+	<item name="android:windowExitTransition">@transition/explode</item>
+	<item name="android:windowSharedElementEnterTransition">@transition/move_image</item>
+	<item name="android:windowSharedElementExitTransition">@transition/move_image</item>
+	<item name="android:windowAllowExitTransitionOverlap">true</item>
+	<item name="android:windowAllowEnterTransitionOverlap">false</item>
+        <item name="android:windowContentTransitions">true</item>
     </style>
 
 </resources>
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
index 289bbd59f..3a6fbf743 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
@@ -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;
     }
 }
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransitionDetails.java b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransitionDetails.java
index 0c74d2c25..9ad1002d9 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransitionDetails.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransitionDetails.java
@@ -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;
     }
-
 }