From 365f55efc5c97b37a58661075a7b447f9a526689 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Wed, 29 Nov 2023 08:59:31 +0000 Subject: [PATCH] [PK Setting] update searchable if page is not visible if PK setting is not available, also make it not searchable. Test: verified on device Bug: 301881819 Change-Id: I6e71634ce5ddc6d5db3d31f5614fef7ccabc6d3d --- .../android/settings/inputmethod/ModifierKeysSettings.java | 3 ++- .../settings/inputmethod/PhysicalKeyboardFragment.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/inputmethod/ModifierKeysSettings.java b/src/com/android/settings/inputmethod/ModifierKeysSettings.java index 2353c2c35ea..f17459805b5 100644 --- a/src/com/android/settings/inputmethod/ModifierKeysSettings.java +++ b/src/com/android/settings/inputmethod/ModifierKeysSettings.java @@ -58,7 +58,8 @@ public class ModifierKeysSettings extends DashboardFragment { protected boolean isPageSearchEnabled(Context context) { return FeatureFlagUtils .isEnabled( - context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_MODIFIER_KEY); + context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_MODIFIER_KEY) + && !PhysicalKeyboardFragment.getHardKeyboards(context).isEmpty(); } }; } diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 1ca9ee65cdb..0e95840a1ca 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -474,5 +474,10 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment sir.xmlResId = R.xml.physical_keyboard_settings; return Arrays.asList(sir); } + + @Override + protected boolean isPageSearchEnabled(Context context) { + return !getHardKeyboards(context).isEmpty(); + } }; }