diff options
author | Trevor Johns <trevorjohns@google.com> | 2014-11-06 03:09:30 +0000 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2014-11-06 03:09:30 +0000 |
commit | 6302c36a2a42eb01a17e54e6f49e771a55c28742 (patch) | |
tree | 058e3cf72b15a8d55032f78bbe929f4376e090a9 /ui/activityscenetransition | |
parent | ec34b115efb2bd350d22a4a3d86208a042cee984 (diff) | |
download | android-6302c36a2a42eb01a17e54e6f49e771a55c28742.tar.gz |
ActivitySceneTransitionBasic: Update method calls for compatibility with API 21
- Change ImageView.setViewName() to .setTransitionName()
Change-Id: Ie60b6fa6653c09005d8681023813c8781b8bf74c
Diffstat (limited to 'ui/activityscenetransition')
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java index 741cd26e..95890089 100644 --- a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java +++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java @@ -65,8 +65,8 @@ public class DetailActivity extends Activity { * This could be done in the layout XML, but exposing it via static variables allows easy * querying from other Activities */ - mHeaderImageView.setViewName(VIEW_NAME_HEADER_IMAGE); - mHeaderTitle.setViewName(VIEW_NAME_HEADER_TITLE); + mHeaderImageView.setTransitionName(VIEW_NAME_HEADER_IMAGE); + mHeaderTitle.setTransitionName(VIEW_NAME_HEADER_TITLE); // END_INCLUDE(detail_set_view_name) loadItem(item); diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java index 36309903..9c51789d 100644 --- a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java +++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java @@ -135,8 +135,8 @@ public class MainActivity extends Activity implements AdapterView.OnItemClickLis * As we're in an adapter we need to set each view's name dynamically, using the * item's ID so that the names are unique. */ - image.setViewName("grid:image:" + item.getId()); - name.setViewName("grid:name:" + item.getId()); + image.setTransitionName("grid:image:" + item.getId()); + name.setTransitionName("grid:name:" + item.getId()); // END_INCLUDE(grid_set_view_name) return view; |