Merge "Fixes searchability for timeout settings page." into main

This commit is contained in:
Riley Jones
2024-11-04 21:10:38 +00:00
committed by Android (Google) Code Review

View File

@@ -22,35 +22,46 @@
<com.android.settingslib.widget.TopIntroPreference
android:key="accessibility_control_timeout_intro"
android:title="@string/accessibility_control_timeout_preference_intro_text"/>
android:title="@string/accessibility_control_timeout_preference_intro_text"
settings:searchable="false"/>
<com.android.settingslib.widget.IllustrationPreference
android:key="accessibility_control_timeout_banner"
settings:lottie_rawRes="@raw/a11y_timeout_banner"/>
<!-- Items in a list should not be searchable. -->
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_default"
android:title="@string/accessibility_timeout_default"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController" />
<!-- Items in a list should not be searchable. -->
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_10secs"
android:title="@string/accessibility_timeout_10secs"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
<!-- Items in a list should not be searchable. -->
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_30secs"
android:title="@string/accessibility_timeout_30secs"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
<!-- Items in a list should not be searchable. -->
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_1min"
android:title="@string/accessibility_timeout_1min"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
<!-- Items in a list should not be searchable. -->
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_2mins"
android:title="@string/accessibility_timeout_2mins"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
<com.android.settings.accessibility.AccessibilityFooterPreference