API Review: Change View viewName attribute to transitionName.
Bug 15548520
Change-Id: Ie1c9fedfb1ff7e3b4e16435f71fc9df4b9107636
diff --git a/samples/ApiDemos/res/layout/image_block.xml b/samples/ApiDemos/res/layout/image_block.xml
index 4233717..04b8d3f 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 a176ce5..1daee46 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"
