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

Commit 262b9d9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Turn off voice access in 16KB mode"" into main

parents 7fb8f02f 5da12934

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

+0 −8
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.internal.content.PackageMonitor; 
import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.development.Enable16kUtils;

import com.android.settings.inputmethod.PhysicalKeyboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -101,8 +100,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
    static final String EXTRA_TIME_FOR_LOGGING = "start_time_to_log_a11y_tool";

    static final String EXTRA_METRICS_CATEGORY = "metrics_category";



    public static final String VOICE_ACCESS_SERVICE = "android.apps.accessibility.voiceaccess";



    // Timeout before we update the services if packages are added/removed

    // since the AccessibilityManagerService has to do that processing first

    // to generate the AccessibilityServiceInfo we need for proper
@@ -496,11 +493,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
        String[] services = getResources().getStringArray(key);

        PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);

        for (int i = 0; i < services.length; i++) {

            // TODO(b/335443194) Voice access is not available in 16kB mode.

            if (services[i].contains(VOICE_ACCESS_SERVICE)

                    && Enable16kUtils.isPageAgnosticModeOn(getContext())) {

                continue;

            }

            ComponentName component = ComponentName.unflattenFromString(services[i]);

            mPreBundledServiceComponentToCategoryMap.put(component, category);

        }

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

+0 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings.accessibility;



import static com.android.settings.accessibility.AccessibilitySettings.VOICE_ACCESS_SERVICE;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.accessibilityservice.AccessibilityShortcutInfo;

import android.app.AppOpsManager;
@@ -31,7 +29,6 @@ import android.os.UserHandle; 
import android.text.TextUtils;



import com.android.settings.R;

import com.android.settings.development.Enable16kUtils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.RestrictedPreference;
@@ -81,11 +78,6 @@ public class RestrictedPreferenceHelper { 
            final AccessibilityServiceInfo info = installedServices.get(i);

            final ResolveInfo resolveInfo = info.getResolveInfo();

            final String packageName = resolveInfo.serviceInfo.packageName;

            // TODO(b/335443194) Voice access is not available in 16kB mode.

            if (packageName.contains(VOICE_ACCESS_SERVICE)

                    && Enable16kUtils.isPageAgnosticModeOn(mContext)) {

                continue;

            }



            final ComponentName componentName = new ComponentName(packageName,

                    resolveInfo.serviceInfo.name);