From c580adec2668bf59b0faeffc17bf51296db41045 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 23 Jun 2014 14:57:46 +0000
Subject: [PATCH] Revert "Revert "API Review: Change View viewName attribute to
 transitionName.""

This reverts commit f4138cbcfc742dbe6e40ee054fbb52ebfebaa0ef.

Change-Id: Id5531f7508b22cf0242a5bef063423d932eb104e
---
 samples/ApiDemos/res/layout/image_block.xml      | 16 ++++++++--------
 samples/ApiDemos/res/layout/image_details.xml    |  2 +-
 .../apis/animation/ActivityTransition.java       |  2 +-
 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 423371740..04b8d3fa0 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:viewName="ducky"
+               android:transitionName="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:viewName="woot"
+               android:transitionName="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:viewName="ball"
+               android:transitionName="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:viewName="block"
+               android:transitionName="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:viewName="jellies"
+               android:transitionName="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:viewName="mug"
+               android:transitionName="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:viewName="pencil"
+               android:transitionName="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:viewName="scissors"
+               android:transitionName="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 a176ce524..1daee4668 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:viewName="hero"
+               android:transitionName="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 bd638708e..b29582669 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
@@ -117,7 +117,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.getViewName());
+        intent.putExtra(KEY_ID, v.getTransitionName());
         ActivityOptions activityOptions
                 = ActivityOptions.makeSceneTransitionAnimation(this, mHero, "hero");
         startActivity(intent, activityOptions.toBundle());