Merge "Fix that when selecting a SlicePreference item by mouse, the corresponding preview page was not loaded properly, resulting in a crash" into main am: 8342dd92b1 am: 7aa34f0c4e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/3255002
Change-Id: I8b0ccf211587b1882da720b48067f8f0a1244de7
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
index 0debc00..0f5642c 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
@@ -274,9 +274,10 @@
}
} else {
// If there is no corresponding slice provider, thus the corresponding fragment is not
- // created, return false to check the intent of the SlicePreference.
+ // created, return true so it won't be handled by onPreferenceTreeClick in
+ // PreferenceFragment, but instead onPreferenceFocused will handle it.
if (pref instanceof SlicePreference) {
- return false;
+ return true;
}
try {
Fragment fragment = Fragment.instantiate(getActivity(), pref.getFragment(),
