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

* 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

View File

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