Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev am: 097514b34c

am: 0ba81b53e9

* commit '0ba81b53e910e3e5c9f9ed86ae41870baf426ebc':
  SupportLeanbackshowcase: clean up preference fragment code

Change-Id: I5edc1876f5ad17f06b76da0ce1450f73592202f5
This commit is contained in:
Dake Gu
2016-05-13 17:49:40 +00:00
committed by android-build-merger

View File

@@ -30,9 +30,7 @@ import android.widget.Toast;
import java.util.Arrays;
import java.util.Stack;
public class SettingsExampleFragment extends LeanbackSettingsFragment implements DialogPreference.TargetFragment {
private final Stack<Fragment> fragments = new Stack<Fragment>();
public class SettingsExampleFragment extends LeanbackSettingsFragment {
@Override
public void onPreferenceStartInitialScreen() {
@@ -53,11 +51,6 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
return true;
}
@Override
public Preference findPreference(CharSequence prefKey) {
return ((PreferenceFragment) fragments.peek()).findPreference(prefKey);
}
private PreferenceFragment buildPreferenceFragment(int preferenceResId, String root) {
PreferenceFragment fragment = new PrefFragment();
Bundle args = new Bundle();
@@ -67,7 +60,7 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
return fragment;
}
private class PrefFragment extends LeanbackPreferenceFragment {
public static class PrefFragment extends LeanbackPreferenceFragment {
@Override
public void onCreatePreferences(Bundle bundle, String s) {
@@ -92,16 +85,5 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
return super.onPreferenceTreeClick(preference);
}
@Override
public void onAttach(Context context) {
fragments.push(this);
super.onAttach(context);
}
@Override
public void onDetach() {
fragments.pop();
super.onDetach();
}
}
}