Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev
This commit is contained in:
@@ -30,9 +30,7 @@ import android.widget.Toast;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
|
||||||
public class SettingsExampleFragment extends LeanbackSettingsFragment implements DialogPreference.TargetFragment {
|
public class SettingsExampleFragment extends LeanbackSettingsFragment {
|
||||||
|
|
||||||
private final Stack<Fragment> fragments = new Stack<Fragment>();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPreferenceStartInitialScreen() {
|
public void onPreferenceStartInitialScreen() {
|
||||||
@@ -53,11 +51,6 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Preference findPreference(CharSequence prefKey) {
|
|
||||||
return ((PreferenceFragment) fragments.peek()).findPreference(prefKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
private PreferenceFragment buildPreferenceFragment(int preferenceResId, String root) {
|
private PreferenceFragment buildPreferenceFragment(int preferenceResId, String root) {
|
||||||
PreferenceFragment fragment = new PrefFragment();
|
PreferenceFragment fragment = new PrefFragment();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
@@ -67,7 +60,7 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
|
|||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class PrefFragment extends LeanbackPreferenceFragment {
|
public static class PrefFragment extends LeanbackPreferenceFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreatePreferences(Bundle bundle, String s) {
|
public void onCreatePreferences(Bundle bundle, String s) {
|
||||||
@@ -92,16 +85,5 @@ public class SettingsExampleFragment extends LeanbackSettingsFragment implements
|
|||||||
return super.onPreferenceTreeClick(preference);
|
return super.onPreferenceTreeClick(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAttach(Context context) {
|
|
||||||
fragments.push(this);
|
|
||||||
super.onAttach(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDetach() {
|
|
||||||
fragments.pop();
|
|
||||||
super.onDetach();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user