From 2672623e1dcb95e76f7e00402aaf891d8980aaea Mon Sep 17 00:00:00 2001 From: Dake Gu Date: Thu, 12 May 2016 11:09:53 -0700 Subject: [PATCH] SupportLeanbackshowcase: clean up preference fragment code Remove the dialog code and the problematic stack. Make fragment public static. Change-Id: I3ebda40e6778d206d494429797d7cd6f15c580f4 --- .../app/settings/SettingsExampleFragment.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/settings/SettingsExampleFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/settings/SettingsExampleFragment.java index b9bb77f6a..0276d538d 100644 --- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/settings/SettingsExampleFragment.java +++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/settings/SettingsExampleFragment.java @@ -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 fragments = new Stack(); +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(); - } } }