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

Merge "Fixing NPE + Compilation issue with Showcase sample app." into nyc-dev

Browse Source
This commit is contained in:
Susnata Basak
2016-04-26 21:46:26 +00:00
committed by Android (Google) Code Review
parent dd31c628dd cff3b41c42
commit 32e05f3983
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/page/PageAndListRowFragment.java
View File

@@ -3,7 +3,6 @@ package android.support.v17.leanback.supportleanbackshowcase.app.page;
import android.app.Fragment;
import android.os.Bundle;
import android.os.Handler;
import android.support.v17.leanback.app.Adaptable;
import android.support.v17.leanback.app.BrowseFragment;
import android.support.v17.leanback.app.RowsFragment;
import android.support.v17.leanback.supportleanbackshowcase.R;
@@ -130,7 +129,7 @@ public class PageAndListRowFragment extends BrowseFragment {
/**
* Simple page fragment implementation.
*/
public static class SampleFragmentA extends Fragment implements Adaptable {
public static class SampleFragmentA extends Fragment implements MainFragmentAdapterProvider {
private final MainFragmentAdapter mMainFragmentAdapter =
new PageAndListRowFragment.PageFragmentAdapterImpl(this);
private boolean mEntranceTransitionState = true;
@@ -141,14 +140,6 @@ public class PageAndListRowFragment extends BrowseFragment {
return inflater.inflate(R.layout.page_fragment, container, false);
}
@Override
public MainFragmentAdapter getAdapter(Class clazz) {
if (clazz == MainFragmentAdapter.class) {
return mMainFragmentAdapter;
}
return null;
}
public void setEntranceTransitionState(boolean state) {
mEntranceTransitionState = state;
View view = getView();
@@ -168,6 +159,11 @@ public class PageAndListRowFragment extends BrowseFragment {
setEntranceTransitionState(mEntranceTransitionState);
mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
}
@Override
public MainFragmentAdapter getMainFragmentAdapter() {
return mMainFragmentAdapter;
}
}
/**
@@ -201,11 +197,13 @@ public class PageAndListRowFragment extends BrowseFragment {
}
private void createRows() {
String json = Utils.inputStreamToString(getResources().openRawResource(
R.raw.cards_example));
CardRow[] rows = new Gson().fromJson(json, CardRow[].class);
for(CardRow row : rows) {
mRowsAdapter.add(createCardRow(row));
if (isAdded()) {
String json = Utils.inputStreamToString(getResources().openRawResource(
R.raw.cards_example));
CardRow[] rows = new Gson().fromJson(json, CardRow[].class);
for (CardRow row : rows) {
mRowsAdapter.add(createCardRow(row));
}
}
}