diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/samples/ApiDemos/res/layout/image_block.xml b/samples/ApiDemos/res/layout/image_block.xml index b91818c8c..423371740 100644 --- a/samples/ApiDemos/res/layout/image_block.xml +++ b/samples/ApiDemos/res/layout/image_block.xml @@ -15,7 +15,7 @@ android:layout_row="0" android:src="@drawable/ducky" android:onClick="clicked" - android:sharedElementName="ducky" + android:viewName="ducky" /> <ImageView android:id="@+id/woot" android:layout_height="wrap_content" @@ -25,7 +25,7 @@ android:layout_column="1" android:layout_row="0" android:onClick="clicked" - android:sharedElementName="woot" + android:viewName="woot" /> <ImageView android:id="@+id/ball" android:layout_height="wrap_content" @@ -35,7 +35,7 @@ android:layout_column="0" android:layout_row="1" android:onClick="clicked" - android:sharedElementName="ball" + android:viewName="ball" /> <ImageView android:id="@+id/block" android:layout_height="wrap_content" @@ -45,7 +45,7 @@ android:layout_column="1" android:layout_row="1" android:onClick="clicked" - android:sharedElementName="block" + android:viewName="block" /> <ImageView android:id="@+id/jellies" android:layout_height="wrap_content" @@ -55,7 +55,7 @@ android:layout_column="0" android:layout_row="2" android:onClick="clicked" - android:sharedElementName="jellies" + android:viewName="jellies" /> <ImageView android:id="@+id/mug" android:layout_height="wrap_content" @@ -65,7 +65,7 @@ android:layout_column="1" android:layout_row="2" android:onClick="clicked" - android:sharedElementName="mug" + android:viewName="mug" /> <ImageView android:id="@+id/pencil" android:layout_height="wrap_content" @@ -75,7 +75,7 @@ android:layout_column="0" android:layout_row="3" android:onClick="clicked" - android:sharedElementName="pencil" + android:viewName="pencil" /> <ImageView android:id="@+id/scissors" android:layout_height="wrap_content" @@ -85,6 +85,6 @@ android:layout_column="1" android:layout_row="3" android:onClick="clicked" - android:sharedElementName="scissors" + android:viewName="scissors" /> </GridLayout>
\ No newline at end of file diff --git a/samples/ApiDemos/res/layout/image_details.xml b/samples/ApiDemos/res/layout/image_details.xml index 4db2c1d5c..a176ce524 100644 --- a/samples/ApiDemos/res/layout/image_details.xml +++ b/samples/ApiDemos/res/layout/image_details.xml @@ -10,7 +10,7 @@ android:layout_weight="1" android:layout_width="match_parent" android:scaleType="centerCrop" - android:sharedElementName="hero" + android:viewName="hero" android:onClick="clicked" /> <LinearLayout android:layout_height="0px" 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 3a6fbf743..7852ae97f 100644 --- a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java +++ b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java @@ -113,7 +113,7 @@ public class ActivityTransition extends Activity { public void clicked(View v) { mHero = (ImageView) v; Intent intent = new Intent(this, ActivityTransitionDetails.class); - intent.putExtra(KEY_ID, v.getSharedElementName()); + intent.putExtra(KEY_ID, v.getViewName()); ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(getWindow(), mHero, "hero"); startActivity(intent, activityOptions.toBundle()); |