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

am 2e15d6e8: am 0911ea8d: Merge "API Review: change SharedElementListener to SharedElementCallback" into lmp-dev

Browse Source 
* commit '2e15d6e86bd76c252e3ba30ce6321ca95e51eb7c':
  API Review: change SharedElementListener to SharedElementCallback
This commit is contained in:
George Mount
2014-09-05 17:24:14 +00:00
committed by Android Git Automerger
parent 503c0421f5 2e15d6e86b
commit ff05edc7de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import com.example.android.apis.R;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityOptions; import android.app.ActivityOptions;
import android.app.SharedElementListener; import android.app.SharedElementCallback;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.os.Bundle; import android.os.Bundle;
@@ -104,9 +104,9 @@ public class ActivityTransition extends Activity {
mHero = null; mHero = null;
if (name != null) { if (name != null) {
mHero = (ImageView) findViewById(getIdForKey(name)); mHero = (ImageView) findViewById(getIdForKey(name));
setEnterSharedElementListener(new SharedElementListener() { setEnterSharedElementCallback(new SharedElementCallback() {
@Override @Override
public void remapSharedElements(List<String> names, public void onMapSharedElements(List<String> names,
Map<String, View> sharedElements) { Map<String, View> sharedElements) {
sharedElements.put("hero", mHero); sharedElements.put("hero", mHero);
} }