Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 214a71a6 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Explicitly mark the TopIntroPreference not searchable" into main

parents 106738a1 3e96c945

res/xml/accessibility_hearing_aids.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java

+4 −1
Original line number Diff line number Diff line
@@ -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);