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

Commit 58b553a5 authored by Daniel Norman's avatar Daniel Norman
Browse files

Adapt to moved ACCESSIBILITY_MENU_IN_SYSTEM location. 

Bug: 261252772
Test: atest AccessibilitySettingsTest
Change-Id: I33051116c972b46f3861b3658c53ecaa5ec55095
parent 73d72245

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

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceCategory;



import com.android.internal.accessibility.AccessibilityShortcutController;

import com.android.internal.accessibility.util.AccessibilityUtils;

import com.android.internal.content.PackageMonitor;

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
@@ -360,7 +361,7 @@ public class AccessibilitySettings extends DashboardFragment { 
        // ACCESSIBILITY_MENU_IN_SYSTEM is a default pre-bundled interaction control service.

        // If the device opts out of including this service then this is a no-op.

        mPreBundledServiceComponentToCategoryMap.put(

                AccessibilityManager.ACCESSIBILITY_MENU_IN_SYSTEM,

                AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM,

                mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL));



        final List<RestrictedPreference> preferenceList = getInstalledAccessibilityList(

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

+4 −3
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import androidx.fragment.app.FragmentActivity; 
import androidx.preference.PreferenceManager;

import androidx.test.core.app.ApplicationProvider;



import com.android.internal.accessibility.util.AccessibilityUtils;

import com.android.internal.content.PackageMonitor;

import com.android.settings.R;

import com.android.settings.testutils.XmlTestUtils;
@@ -333,11 +334,11 @@ public class AccessibilitySettingsTest { 
    public void testAccessibilityMenuInSystem_IncludedInInteractionControl() {

        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(

                List.of(getMockAccessibilityServiceInfo(

                        AccessibilityManager.ACCESSIBILITY_MENU_IN_SYSTEM)));

                        AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM)));

        setupFragment();



        final RestrictedPreference pref = mFragment.getPreferenceScreen().findPreference(

                AccessibilityManager.ACCESSIBILITY_MENU_IN_SYSTEM.flattenToString());

                AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM.flattenToString());

        final String prefCategory = mFragment.mServicePreferenceToPreferenceCategoryMap.get(

                pref).getKey();

        assertThat(prefCategory).isEqualTo(AccessibilitySettings.CATEGORY_INTERACTION_CONTROL);
@@ -350,7 +351,7 @@ public class AccessibilitySettingsTest { 
        setupFragment();



        final RestrictedPreference pref = mFragment.getPreferenceScreen().findPreference(

                AccessibilityManager.ACCESSIBILITY_MENU_IN_SYSTEM.flattenToString());

                AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM.flattenToString());

        assertThat(pref).isNull();

    }