SupportLeanbackDemo: activity transition
b/15024618 Change-Id: Ib23746360984f3bbe255e8f75df30c7422b553f2
@@ -12,7 +12,7 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:icon="@drawable/ic_launcher"
|
android:icon="@drawable/ic_launcher"
|
||||||
android:banner="@drawable/ic_launcher"
|
android:banner="@drawable/ic_launcher"
|
||||||
android:theme="@style/Theme.Leanback">
|
android:theme="@style/Theme.Example.Leanback">
|
||||||
|
|
||||||
<activity android:name="MainActivity"
|
<activity android:name="MainActivity"
|
||||||
android:label="@string/app_name">
|
android:label="@string/app_name">
|
||||||
|
|||||||
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_1.jpg
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_2.jpg
Normal file
|
After Width: | Height: | Size: 6.0 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_3.jpg
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_4.jpg
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_5.jpg
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_6.jpg
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_7.jpg
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
samples/SupportLeanbackDemos/res/drawable/gallery_photo_8.jpg
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
13
samples/SupportLeanbackDemos/res/values/themes.xml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<resources>
|
||||||
|
<style name="Theme.Example.Leanback" parent="Theme.Leanback">
|
||||||
|
<!-- uncomment to override default transition settings:
|
||||||
|
<item name="android:windowEnterTransition">@android:transition/fade</item>
|
||||||
|
<item name="android:windowExitTransition">@android:transition/fade</item>
|
||||||
|
<item name="android:windowSharedElementExitTransition">@android:transition/move</item>
|
||||||
|
<item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
|
||||||
|
<item name="android:windowAllowExitTransitionOverlap">true</item>
|
||||||
|
<item name="android:windowAllowEnterTransitionOverlap">false</item>
|
||||||
|
<item name="android:windowContentTransitions">true</item>
|
||||||
|
-->
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@@ -15,14 +15,19 @@ package com.example.android.leanback;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.support.v4.app.ActivityOptionsCompat;
|
||||||
import android.support.v17.leanback.widget.ArrayObjectAdapter;
|
import android.support.v17.leanback.widget.ArrayObjectAdapter;
|
||||||
import android.support.v17.leanback.widget.HeaderItem;
|
import android.support.v17.leanback.widget.HeaderItem;
|
||||||
|
import android.support.v17.leanback.widget.ImageCardView;
|
||||||
import android.support.v17.leanback.widget.ListRow;
|
import android.support.v17.leanback.widget.ListRow;
|
||||||
import android.support.v17.leanback.widget.ListRowPresenter;
|
import android.support.v17.leanback.widget.ListRowPresenter;
|
||||||
import android.support.v17.leanback.widget.OnItemClickedListener;
|
import android.support.v17.leanback.widget.OnItemViewClickedListener;
|
||||||
|
import android.support.v17.leanback.widget.Presenter;
|
||||||
import android.support.v17.leanback.widget.Row;
|
import android.support.v17.leanback.widget.Row;
|
||||||
|
import android.support.v17.leanback.widget.RowPresenter;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragment {
|
public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragment {
|
||||||
private static final String TAG = "leanback.BrowseFragment";
|
private static final String TAG = "leanback.BrowseFragment";
|
||||||
@@ -48,16 +53,13 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm
|
|||||||
});
|
});
|
||||||
|
|
||||||
setupRows();
|
setupRows();
|
||||||
setOnItemClickedListener(new ItemClickedListener());
|
setOnItemViewClickedListener(new ItemViewClickedListener());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupRows() {
|
private void setupRows() {
|
||||||
ListRowPresenter lrp = new ListRowPresenter();
|
ListRowPresenter lrp = new ListRowPresenter();
|
||||||
float density = getActivity().getResources().getDisplayMetrics().density;
|
lrp.setRowHeight(CardPresenter.getRowHeight(getActivity()));
|
||||||
float height = 160 * density + 0.5f;
|
lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity()));
|
||||||
float expandedHeight = height + 52 * density + 0.5f;
|
|
||||||
lrp.setRowHeight((int)height);
|
|
||||||
lrp.setExpandedRowHeight((int)expandedHeight);
|
|
||||||
|
|
||||||
mRowsAdapter = new ArrayObjectAdapter(lrp);
|
mRowsAdapter = new ArrayObjectAdapter(lrp);
|
||||||
|
|
||||||
@@ -67,8 +69,14 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm
|
|||||||
|
|
||||||
for (int i = 0; i < NUM_ROWS; ++i) {
|
for (int i = 0; i < NUM_ROWS; ++i) {
|
||||||
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
|
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
|
||||||
listRowAdapter.add("Hello world");
|
listRowAdapter.add(new PhotoItem("Hello world", R.drawable.gallery_photo_1));
|
||||||
listRowAdapter.add("This is a test");
|
listRowAdapter.add(new PhotoItem("This is a test", R.drawable.gallery_photo_2));
|
||||||
|
listRowAdapter.add(new PhotoItem("Android TV", R.drawable.gallery_photo_3));
|
||||||
|
listRowAdapter.add(new PhotoItem("Leanback", R.drawable.gallery_photo_4));
|
||||||
|
listRowAdapter.add(new PhotoItem("Hello world", R.drawable.gallery_photo_5));
|
||||||
|
listRowAdapter.add(new PhotoItem("This is a test", R.drawable.gallery_photo_6));
|
||||||
|
listRowAdapter.add(new PhotoItem("Android TV", R.drawable.gallery_photo_7));
|
||||||
|
listRowAdapter.add(new PhotoItem("Leanback", R.drawable.gallery_photo_8));
|
||||||
HeaderItem header = new HeaderItem(i, "Row " + i, null);
|
HeaderItem header = new HeaderItem(i, "Row " + i, null);
|
||||||
mRowsAdapter.add(new ListRow(header, listRowAdapter));
|
mRowsAdapter.add(new ListRow(header, listRowAdapter));
|
||||||
}
|
}
|
||||||
@@ -76,12 +84,18 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm
|
|||||||
setAdapter(mRowsAdapter);
|
setAdapter(mRowsAdapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class ItemClickedListener implements OnItemClickedListener {
|
private final class ItemViewClickedListener implements OnItemViewClickedListener {
|
||||||
public void onItemClicked(Object item, Row row) {
|
@Override
|
||||||
// TODO: use a fragment transaction instead of launching a new
|
public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
|
||||||
// activity
|
RowPresenter.ViewHolder rowViewHolder, Row row) {
|
||||||
Intent intent = new Intent(getActivity(), DetailsActivity.class);
|
Intent intent = new Intent(getActivity(), DetailsActivity.class);
|
||||||
startActivity(intent);
|
intent.putExtra(DetailsActivity.EXTRA_ITEM, (PhotoItem) item);
|
||||||
|
|
||||||
|
Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(
|
||||||
|
getActivity(),
|
||||||
|
((ImageCardView)itemViewHolder.view).getMainImageView(),
|
||||||
|
DetailsActivity.SHARED_ELEMENT_NAME).toBundle();
|
||||||
|
getActivity().startActivity(intent, bundle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,30 +13,71 @@
|
|||||||
*/
|
*/
|
||||||
package com.example.android.leanback;
|
package com.example.android.leanback;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
import android.support.v17.leanback.widget.ImageCardView;
|
import android.support.v17.leanback.widget.ImageCardView;
|
||||||
import android.support.v17.leanback.widget.Presenter;
|
import android.support.v17.leanback.widget.Presenter;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.view.View.MeasureSpec;
|
||||||
|
import android.view.ViewGroup.LayoutParams;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
public class CardPresenter extends Presenter {
|
public class CardPresenter extends Presenter {
|
||||||
private static final String TAG = "CardPresenter";
|
private static final String TAG = "CardPresenter";
|
||||||
|
|
||||||
|
private static final int IMAGE_HEIGHT_DP = 120;
|
||||||
|
|
||||||
|
private static int sRowHeight = 0;
|
||||||
|
private static int sExpandedRowHeight = 0;
|
||||||
|
|
||||||
|
private static void setupRowHeights(Context context) {
|
||||||
|
if (sRowHeight == 0) {
|
||||||
|
float density = context.getResources().getDisplayMetrics().density;
|
||||||
|
int height = (int) (IMAGE_HEIGHT_DP * density + 0.5f);
|
||||||
|
|
||||||
|
ImageCardView v = new ImageCardView(context);
|
||||||
|
v.setMainImageDimensions(LayoutParams.WRAP_CONTENT, height);
|
||||||
|
v.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
|
||||||
|
sRowHeight = v.getMeasuredHeight();
|
||||||
|
v.setActivated(true);
|
||||||
|
v.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
|
||||||
|
sExpandedRowHeight = v.getMeasuredHeight();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getRowHeight(Context context) {
|
||||||
|
setupRowHeights(context);
|
||||||
|
return sRowHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getExpandedRowHeight(Context context) {
|
||||||
|
setupRowHeights(context);
|
||||||
|
return sExpandedRowHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public ViewHolder onCreateViewHolder(ViewGroup parent) {
|
public ViewHolder onCreateViewHolder(ViewGroup parent) {
|
||||||
Log.d(TAG, "onCreateViewHolder");
|
Log.d(TAG, "onCreateViewHolder");
|
||||||
ImageCardView v = new ImageCardView(parent.getContext());
|
ImageCardView v = new ImageCardView(parent.getContext());
|
||||||
v.setFocusable(true);
|
v.setFocusable(true);
|
||||||
v.setFocusableInTouchMode(true);
|
v.setFocusableInTouchMode(true);
|
||||||
v.setMainImage(
|
v.setMainImageAdjustViewBounds(true);
|
||||||
parent.getContext().getResources().getDrawable(R.drawable.text_bg));
|
v.setMainImageDimensions(LayoutParams.WRAP_CONTENT, getRowHeight(parent.getContext()));
|
||||||
return new ViewHolder(v);
|
return new ViewHolder(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void onBindViewHolder(ViewHolder viewHolder, Object item) {
|
public void onBindViewHolder(ViewHolder viewHolder, Object item) {
|
||||||
Log.d(TAG, "onBindViewHolder for " + item.toString());
|
Log.d(TAG, "onBindViewHolder for " + item.toString());
|
||||||
((ImageCardView) viewHolder.view).setTitleText(item.toString());
|
PhotoItem photoItem = (PhotoItem) item;
|
||||||
|
Drawable drawable = viewHolder.view.getContext().getResources()
|
||||||
|
.getDrawable(photoItem.getImageResourceId());
|
||||||
|
((ImageCardView) viewHolder.view).setMainImage(drawable);
|
||||||
|
((ImageCardView) viewHolder.view).setTitleText(photoItem.getTitle());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void onUnbindViewHolder(ViewHolder viewHolder) {
|
public void onUnbindViewHolder(ViewHolder viewHolder) {
|
||||||
Log.d(TAG, "onUnbindViewHolder");
|
Log.d(TAG, "onUnbindViewHolder");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,11 +18,17 @@ import android.os.Bundle;
|
|||||||
|
|
||||||
public class DetailsActivity extends Activity
|
public class DetailsActivity extends Activity
|
||||||
{
|
{
|
||||||
|
public static final String EXTRA_ITEM = "item";
|
||||||
|
public static final String SHARED_ELEMENT_NAME = "hero";
|
||||||
|
|
||||||
/** Called when the activity is first created. */
|
/** Called when the activity is first created. */
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState)
|
public void onCreate(Bundle savedInstanceState)
|
||||||
{
|
{
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.details);
|
setContentView(R.layout.details);
|
||||||
|
((DetailsFragment)getFragmentManager().findFragmentById(R.id.details_fragment))
|
||||||
|
.setItem((PhotoItem) getIntent().getParcelableExtra(EXTRA_ITEM));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ package com.example.android.leanback;
|
|||||||
|
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.support.v4.app.ActivityCompat;
|
||||||
|
import android.support.v4.view.ViewCompat;
|
||||||
import android.support.v17.leanback.widget.Action;
|
import android.support.v17.leanback.widget.Action;
|
||||||
import android.support.v17.leanback.widget.ArrayObjectAdapter;
|
import android.support.v17.leanback.widget.ArrayObjectAdapter;
|
||||||
import android.support.v17.leanback.widget.ClassPresenterSelector;
|
import android.support.v17.leanback.widget.ClassPresenterSelector;
|
||||||
@@ -24,24 +26,28 @@ import android.support.v17.leanback.widget.HeaderItem;
|
|||||||
import android.support.v17.leanback.widget.ListRow;
|
import android.support.v17.leanback.widget.ListRow;
|
||||||
import android.support.v17.leanback.widget.ListRowPresenter;
|
import android.support.v17.leanback.widget.ListRowPresenter;
|
||||||
import android.support.v17.leanback.widget.OnActionClickedListener;
|
import android.support.v17.leanback.widget.OnActionClickedListener;
|
||||||
|
import android.support.v17.leanback.widget.RowPresenter;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class DetailsFragment extends android.support.v17.leanback.app.DetailsFragment {
|
public class DetailsFragment extends android.support.v17.leanback.app.DetailsFragment {
|
||||||
private static final String TAG = "leanback.BrowseFragment";
|
private static final String TAG = "leanback.BrowseFragment";
|
||||||
|
private static final String ITEM = "item";
|
||||||
|
|
||||||
private static final int NUM_ROWS = 3;
|
private static final int NUM_ROWS = 3;
|
||||||
private ArrayObjectAdapter mRowsAdapter;
|
private ArrayObjectAdapter mRowsAdapter;
|
||||||
|
private PhotoItem mPhotoItem;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
Log.i(TAG, "onCreate");
|
Log.i(TAG, "onCreate");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
setupRows();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setupRows() {
|
|
||||||
ClassPresenterSelector ps = new ClassPresenterSelector();
|
ClassPresenterSelector ps = new ClassPresenterSelector();
|
||||||
DetailsOverviewRowPresenter dorPresenter =
|
DetailsOverviewRowPresenter dorPresenter =
|
||||||
new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
|
new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
|
||||||
@@ -54,11 +60,30 @@ public class DetailsFragment extends android.support.v17.leanback.app.DetailsFra
|
|||||||
ps.addClassPresenter(DetailsOverviewRow.class, dorPresenter);
|
ps.addClassPresenter(DetailsOverviewRow.class, dorPresenter);
|
||||||
ps.addClassPresenter(ListRow.class,
|
ps.addClassPresenter(ListRow.class,
|
||||||
new ListRowPresenter());
|
new ListRowPresenter());
|
||||||
|
|
||||||
mRowsAdapter = new ArrayObjectAdapter(ps);
|
mRowsAdapter = new ArrayObjectAdapter(ps);
|
||||||
|
|
||||||
|
PhotoItem item = (PhotoItem) (savedInstanceState != null ?
|
||||||
|
savedInstanceState.getParcelable(ITEM) : null);
|
||||||
|
if (item != null) {
|
||||||
|
setItem(item);
|
||||||
|
}
|
||||||
|
dorPresenter.setSharedElementEnterTransition(getActivity(),
|
||||||
|
DetailsActivity.SHARED_ELEMENT_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
outState.putParcelable(ITEM, mPhotoItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setItem(PhotoItem photoItem) {
|
||||||
|
mPhotoItem = photoItem;
|
||||||
|
|
||||||
Resources res = getActivity().getResources();
|
Resources res = getActivity().getResources();
|
||||||
DetailsOverviewRow dor = new DetailsOverviewRow("Details Overview");
|
DetailsOverviewRow dor = new DetailsOverviewRow("Details Overview");
|
||||||
dor.setImageDrawable(res.getDrawable(R.drawable.details_img));
|
dor.setImageDrawable(res.getDrawable(photoItem.getImageResourceId()));
|
||||||
dor.addAction(new Action(1, "Buy $9.99"));
|
dor.addAction(new Action(1, "Buy $9.99"));
|
||||||
dor.addAction(new Action(2, "Rent", "$3.99", res.getDrawable(R.drawable.ic_action_a)));
|
dor.addAction(new Action(2, "Rent", "$3.99", res.getDrawable(R.drawable.ic_action_a)));
|
||||||
mRowsAdapter.add(dor);
|
mRowsAdapter.add(dor);
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software distributed under the License
|
||||||
|
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
||||||
|
* or implied. See the License for the specific language governing permissions and limitations under
|
||||||
|
* the License.
|
||||||
|
*/
|
||||||
|
package com.example.android.leanback;
|
||||||
|
|
||||||
|
import android.os.Parcel;
|
||||||
|
import android.os.Parcelable;
|
||||||
|
|
||||||
|
public class PhotoItem implements Parcelable {
|
||||||
|
|
||||||
|
private String mTitle;
|
||||||
|
private int mImageResourceId;
|
||||||
|
|
||||||
|
public PhotoItem(String title, int imageResourceId) {
|
||||||
|
mTitle = title;
|
||||||
|
mImageResourceId = imageResourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getImageResourceId() {
|
||||||
|
return mImageResourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return mTitle;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return mTitle;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int describeContents() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeToParcel(Parcel dest, int flags) {
|
||||||
|
dest.writeString(mTitle);
|
||||||
|
dest.writeInt(mImageResourceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final Parcelable.Creator<PhotoItem> CREATOR
|
||||||
|
= new Parcelable.Creator<PhotoItem>() {
|
||||||
|
@Override
|
||||||
|
public PhotoItem createFromParcel(Parcel in) {
|
||||||
|
return new PhotoItem(in);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PhotoItem[] newArray(int size) {
|
||||||
|
return new PhotoItem[size];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private PhotoItem(Parcel in) {
|
||||||
|
mTitle = in.readString();
|
||||||
|
mImageResourceId = in.readInt();
|
||||||
|
}
|
||||||
|
}
|
||||||