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

Commit 7ae3c078 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Remove accessibility duplicates in settings search 

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
parent f1f35ee1

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/DisplaySettings.java

+9 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ import java.util.List; 
public class DisplaySettings extends DashboardFragment {

    private static final String TAG = "DisplaySettings";



    public static final String KEY_DISPLAY_SIZE = "screen_zoom";



    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";

    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
@@ -122,6 +124,13 @@ public class DisplaySettings extends DashboardFragment { 
                    return result;

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    List<String> keys = new ArrayList<>();

                    keys.add(KEY_DISPLAY_SIZE);

                    return keys;

                }



                @Override

                public List<PreferenceController> getPreferenceControllers(Context context) {

                    return buildPreferenceControllers(context, null);

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

+13 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.content.PackageMonitor; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.view.RotationPolicy;

import com.android.internal.view.RotationPolicy.RotationPolicyListener;

import com.android.settings.DisplaySettings;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;
@@ -721,7 +722,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            new BaseSearchIndexProvider() {

        @Override

        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {

            List<SearchIndexableRaw> indexables = new ArrayList<SearchIndexableRaw>();

            List<SearchIndexableRaw> indexables = new ArrayList<>();



            PackageManager packageManager = context.getPackageManager();

            AccessibilityManager accessibilityManager =
@@ -763,5 +764,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            indexables.add(indexable);

            return indexables;

        }



        @Override

        public List<String> getNonIndexableKeys(Context context) {

            List<String> keys = new ArrayList<>();

            // Duplicates in Display

            keys.add(FONT_SIZE_PREFERENCE_SCREEN);

            // TODO (b/37741509) Remove this non-indexble key when bug is resolved.

            keys.add(DisplaySettings.KEY_DISPLAY_SIZE);



            return keys;

        }

    };

}

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;

                }

            };

}

src/com/android/settings/search/BaseSearchIndexProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.List; 
public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {



    private static final String TAG = "BaseSearchIndex";

    private static final List<String> EMPTY_LIST = Collections.emptyList();

    private static final List<String> EMPTY_LIST = new ArrayList<>();



    public BaseSearchIndexProvider() {

    }