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

Commit 49915a64 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Remove accessibility duplicates in settings search 

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
parent ea63c976

src/com/android/settings/DisplaySettings.java

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ public class DisplaySettings extends DashboardFragment { 
    private static final String TAG = "DisplaySettings";



    public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";

    public static final String KEY_DISPLAY_SIZE = "screen_zoom";



    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";



    @Override
@@ -124,6 +126,13 @@ public class DisplaySettings extends DashboardFragment { 
                    return result;

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

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

                    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

+12 −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,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            indexables.add(indexable);

            return indexables;

        }



        @Override

        public List<String> getNonIndexableKeys(Context context) {

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

            // Duplicates in Display

            keys.add(FONT_SIZE_PREFERENCE_SCREEN);

            keys.add(DisplaySettings.KEY_DISPLAY_SIZE);



            return keys;

        }

    };

}

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

0 → 100644
+34 −0
Original line number Diff line number Diff line 
package com.android.settings.accessibility;



import android.content.Context;



import com.android.settings.R;

import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.testutils.XmlTestUtils;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.util.ArrayList;

import java.util.List;



import static com.google.common.truth.Truth.assertThat;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class AccessibilitySettingsTest {



    @Test

    public void testNonIndexableKeys_existInXmlLayout() {

        final Context context = RuntimeEnvironment.application;

        final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(context);

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



        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));



        assertThat(keys).containsAllIn(niks);

    }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -93,10 +93,7 @@ public class DataIntegrityTest { 
        for (Integer xmlResId : xmlList) {

            // Get all keys to be indexed

            final List<String> prefKeys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlResId);



            pageKeys.addAll(prefKeys);

            // Remove grandfathered keys.

            pageKeys.removeAll(grandfatheredKeys);

            // Find all already-existing keys.

            pageKeys.retainAll(masterKeys);

            // Keep list of offending duplicate keys.
@@ -105,7 +102,7 @@ public class DataIntegrityTest { 
            masterKeys.addAll(prefKeys);

            pageKeys.clear();

        }

        assertThat(duplicateKeys).isEmpty();

        assertThat(duplicateKeys).containsExactlyElementsIn(grandfatheredKeys);

    }



    /**