PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicitly mark the TopIntroPreference not searchable" into main

Browse Source
This commit is contained in:
Daniel Norman
2024-11-06 17:57:25 +00:00
committed by Android (Google) Code Review
parent 106738a1b1 3e96c9459b
commit 214a71a697
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/accessibility_hearing_aids.xml
View File

@@ -20,7 +20,8 @@
android:title="@string/accessibility_hearingaid_title">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/accessibility_hearingaid_intro" />
android:title="@string/accessibility_hearingaid_intro"
settings:searchable="false" />
<PreferenceCategory
android:key="available_hearing_devices"

5
tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
View File

@@ -51,6 +51,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import java.util.List;
import java.util.Objects;
/** Tests for {@link AccessibilityHearingAidsFragment}. */
@RunWith(RobolectricTestRunner.class)
@@ -88,7 +89,9 @@ public class AccessibilityHearingAidsFragmentTest {
mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
final List<String> niks = AccessibilityHearingAidsFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
.getNonIndexableKeys(mContext).stream()
.filter(Objects::nonNull)
.toList();
final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_hearing_aids);