LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "API Review: Change View viewName attribute to transitionName.""

Browse Source 
This reverts commit f4138cbcfc.

Change-Id: Id5531f7508b22cf0242a5bef063423d932eb104e
This commit is contained in:
George Mount
2014-06-23 14:57:46 +00:00
parent da59fc09c9
commit c580adec26
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/ApiDemos/res/layout/image_block.xml
View File

@@ -15,7 +15,7 @@
android:layout_row="0" android:layout_row="0"
android:src="@drawable/ducky" android:src="@drawable/ducky"
android:onClick="clicked" android:onClick="clicked"
android:viewName="ducky" android:transitionName="ducky"
/> />
<ImageView android:id="@+id/woot" <ImageView android:id="@+id/woot"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
android:layout_column="1" android:layout_column="1"
android:layout_row="0" android:layout_row="0"
android:onClick="clicked" android:onClick="clicked"
android:viewName="woot" android:transitionName="woot"
/> />
<ImageView android:id="@+id/ball" <ImageView android:id="@+id/ball"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
android:layout_column="0" android:layout_column="0"
android:layout_row="1" android:layout_row="1"
android:onClick="clicked" android:onClick="clicked"
android:viewName="ball" android:transitionName="ball"
/> />
<ImageView android:id="@+id/block" <ImageView android:id="@+id/block"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
android:layout_column="1" android:layout_column="1"
android:layout_row="1" android:layout_row="1"
android:onClick="clicked" android:onClick="clicked"
android:viewName="block" android:transitionName="block"
/> />
<ImageView android:id="@+id/jellies" <ImageView android:id="@+id/jellies"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
android:layout_column="0" android:layout_column="0"
android:layout_row="2" android:layout_row="2"
android:onClick="clicked" android:onClick="clicked"
android:viewName="jellies" android:transitionName="jellies"
/> />
<ImageView android:id="@+id/mug" <ImageView android:id="@+id/mug"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
android:layout_column="1" android:layout_column="1"
android:layout_row="2" android:layout_row="2"
android:onClick="clicked" android:onClick="clicked"
android:viewName="mug" android:transitionName="mug"
/> />
<ImageView android:id="@+id/pencil" <ImageView android:id="@+id/pencil"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
android:layout_column="0" android:layout_column="0"
android:layout_row="3" android:layout_row="3"
android:onClick="clicked" android:onClick="clicked"
android:viewName="pencil" android:transitionName="pencil"
/> />
<ImageView android:id="@+id/scissors" <ImageView android:id="@+id/scissors"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -85,6 +85,6 @@
android:layout_column="1" android:layout_column="1"
android:layout_row="3" android:layout_row="3"
android:onClick="clicked" android:onClick="clicked"
android:viewName="scissors" android:transitionName="scissors"
/> />
</GridLayout> </GridLayout>

2
samples/ApiDemos/res/layout/image_details.xml
View File

@@ -10,7 +10,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:viewName="hero" android:transitionName="hero"
android:onClick="clicked" android:onClick="clicked"
/> />
<LinearLayout android:layout_height="0px" <LinearLayout android:layout_height="0px"

2
samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java
View File

@@ -117,7 +117,7 @@ public class ActivityTransition extends Activity {
public void clicked(View v) { public void clicked(View v) {
mHero = (ImageView) v; mHero = (ImageView) v;
Intent intent = new Intent(this, ActivityTransitionDetails.class); Intent intent = new Intent(this, ActivityTransitionDetails.class);
intent.putExtra(KEY_ID, v.getViewName()); intent.putExtra(KEY_ID, v.getTransitionName());
ActivityOptions activityOptions ActivityOptions activityOptions
= ActivityOptions.makeSceneTransitionAnimation(this, mHero, "hero"); = ActivityOptions.makeSceneTransitionAnimation(this, mHero, "hero");
startActivity(intent, activityOptions.toBundle()); startActivity(intent, activityOptions.toBundle());