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

Commit cc663236 authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Revert "Turn off voice access in 16KB mode" 

This reverts commit 6de40938.

Reason for revert: b/335443194 is fixed now

Change-Id: Id2c4584835766e9620234233b6594c0dd59b68e9
parent 79e19184

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

+0 −8
Original line number Diff line number Diff line
@@ -43,7 +43,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.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.RestrictedPreference;
@@ -96,8 +95,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
@@ -503,11 +500,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 −9
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,12 +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);

            final boolean serviceEnabled = enabledServices.contains(componentName);