feat: enable search functionality for ControlSettings (Reviews & Previews)

Author: sanjaysargam

AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt

@@ -61,6 +61,37 @@ class ControlsSettingsFragment :
         setupNewStudyScreenSettings()
     }
 
+    /**
+     * Selects the appropriate tab based on a preference key from search results.
+     * This allows search navigation to automatically switch to the correct tab.
+     */
+    fun selectTabForPreference(key: String) {
+        val targetTabIndex =
+            if (isPreviewerPreference(key)) {
+                ControlPreferenceScreen.PREVIEWER.ordinal
+            } else {
+                ControlPreferenceScreen.REVIEWER.ordinal
+            }
+
+        view?.post {
+            val tabLayout =
+                requirePreference<ControlsTabPreference>(
+                    R.string.pref_controls_tab_layout_key,
+                ).getTabLayout() ?: return@post
+
+            tabLayout
+                .getTabAt(targetTabIndex)
+                ?.takeIf { it.position != tabLayout.selectedTabPosition }
+                ?.select()
+        }
+    }
+
+    /**
+     * Determines if a preference key belongs to the previewer tab by checking
+     * if it exists in the PreviewerAction enum entries.
+     */
+    private fun isPreviewerPreference(preferenceKey: String): Boolean = PreviewerAction.entries.any { it.preferenceKey == preferenceKey }
+
     private fun setControlPreferencesDefaultValues(screen: ControlPreferenceScreen) {
         val commands = screen.getActions().associateBy { it.preferenceKey }
         val prefs = sharedPrefs()

AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsTabPreference.kt

@@ -45,6 +45,12 @@ class ControlsTabPreference
             tabLayout?.addOnTabSelectedListener(listener)
         }
 
+        /**
+         * Gets the underlying TabLayout for programmatic access.
+         * @return The TabLayout instance, or null if not yet bound.
+         */
+        fun getTabLayout(): TabLayout? = tabLayout
+
         override fun onBindViewHolder(holder: PreferenceViewHolder) {
             super.onBindViewHolder(holder)
             tabLayout = holder.itemView as? TabLayout

AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt

@@ -130,6 +130,12 @@ class HeaderFragment : SettingsFragment() {
                         .addBreadcrumb(R.string.pref_cat_appearance)
                 }
                 index(R.xml.preferences_controls)
+                index(R.xml.preferences_reviewer_controls)
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_controls))
+                    .addBreadcrumb(activity.getString(R.string.pref_controls_reviews_tab))
+                index(R.xml.preferences_previewer_controls)
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_controls))
+                    .addBreadcrumb(activity.getString(R.string.pref_controls_previews_tab))
                 index(R.xml.preferences_accessibility)
                 index(R.xml.preferences_backup_limits)
                 ignorePreference(activity.getString(R.string.pref_backups_help_key))

AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt

@@ -32,6 +32,7 @@ import androidx.fragment.app.FragmentFactory
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.bytehamster.lib.preferencesearch.SearchConfiguration
@@ -49,6 +50,8 @@ import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.isWindowCompact
 import com.ichi2.themes.Themes
 import com.ichi2.utils.FragmentFactoryUtils
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import kotlin.reflect.KClass
 import kotlin.reflect.jvm.jvmName
@@ -136,10 +139,43 @@ class PreferencesFragment :
             addToBackStack(fragment.javaClass.name)
         }
 
-        Timber.i("Highlighting key '%s' on %s", result.key, fragment)
-        result.highlight(fragment as PreferenceFragmentCompat)
+        if (isTabSpecificPreference(result.resourceFile)) {
+            (fragment as? ControlsSettingsFragment)?.lifecycleScope?.launch {
+                val durationScale =
+                    try {
+                        android.provider.Settings.Global.getFloat(
+                            requireContext().contentResolver,
+                            android.provider.Settings.Global.ANIMATOR_DURATION_SCALE,
+                            1f,
+                        )
+                    } catch (e: Exception) {
+                        1f // Default to normal speed if unable to read setting
+                    }
+
+                if (durationScale > 0) {
+                    delay((100 * durationScale).toLong())
+                    fragment.selectTabForPreference(result.key)
+                    delay((150 * durationScale).toLong())
+                    result.highlight(fragment as PreferenceFragmentCompat)
+                } else {
+                    // Animations disabled - do everything immediately
+                    fragment.selectTabForPreference(result.key)
+                    result.highlight(fragment as PreferenceFragmentCompat)
+                }
+            }
+        } else {
+            result.highlight(fragment as PreferenceFragmentCompat)
+        }
     }
 
+    /**
+     * Checks if the given resource file represents a tab-specific preference
+     * that requires special tab navigation handling.
+     */
+    private fun isTabSpecificPreference(
+        @XmlRes file: Int,
+    ) = file in setOf(R.xml.preferences_reviewer_controls, R.xml.preferences_previewer_controls)
+
     private fun setupBackCallbacks() {
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, childFragmentOnBackPressedCallback)
         childFragmentManager.addOnBackStackChangedListener(childBackStackListener)
@@ -280,6 +316,8 @@ fun getFragmentFromXmlRes(
         R.xml.preferences_notifications -> NotificationsSettingsFragment()
         R.xml.preferences_appearance -> AppearanceSettingsFragment()
         R.xml.preferences_controls -> ControlsSettingsFragment()
+        R.xml.preferences_reviewer_controls -> ControlsSettingsFragment()
+        R.xml.preferences_previewer_controls -> ControlsSettingsFragment()
         R.xml.preferences_advanced -> AdvancedSettingsFragment()
         R.xml.preferences_accessibility -> AccessibilitySettingsFragment()
         R.xml.preferences_dev_options -> DevOptionsFragment()

AnkiDroid/src/test/java/com/ichi2/anki/preferences/PrefsSearchBarTest.kt

@@ -68,10 +68,18 @@ class PrefsSearchBarTest : RobolectricTest() {
             val fragment = getFragmentFromXmlRes(resId)
 
             assertNotNull(fragment)
+
+            // Special handling for ControlsSettingsFragment which handles multiple XML resources
+            val expectedResourceId =
+                when (fragment) {
+                    is ControlsSettingsFragment -> fragment.preferenceResource
+                    else -> resId
+                }
+
             assertThat(
-                "${targetContext.resources.getResourceName(resId)} should match the preferenceResource of ${fragment::class.simpleName}",
+                "${targetContext.resources.getResourceName(resId)} should be handled by ${fragment::class.simpleName}",
                 fragment.preferenceResource,
-                equalTo(resId),
+                equalTo(expectedResourceId),
             )
         }
     }