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

Commit 6ad58487 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Remove accessibility duplicates in settings search 

Merge for: ag/2148817

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
parent 87dd45a3

res/xml/accessibility_magnification_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     limitations under the License.

-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:key="magnification_preference_screen_title"

                  android:title="@string/accessibility_screen_magnification_title">

    <Preference

        android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"

src/com/android/settings/accessibility/MagnificationPreferenceFragment.java

+10 −0
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ import android.view.accessibility.AccessibilityManager; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.core.PreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;
@@ -42,6 +44,7 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra 
        Indexable {



    // Settings App preference keys

    private static final String PREFERENCE_TITLE_KEY = "magnification_preference_screen_title";

    private static final String MAGNIFICATION_GESTURES_PREFERENCE_SCREEN_KEY =

            "screen_magnification_gestures_preference_screen";

    private static final String MAGNIFICATION_NAVBAR_PREFERENCE_SCREEN_KEY =
@@ -214,5 +217,12 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra 
                        return Collections.emptyList();

                    }

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    List<String> keys = super.getNonIndexableKeys(context);

                    keys.add(PREFERENCE_TITLE_KEY);

                    return keys;

                }

            };

}

tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class BaseSearchIndexProviderTest { 


    @Test

    public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {

        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);

        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();

    }



    @Test