PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Turn off voice access in 16KB mode"" into main am: 262b9d9b41

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3320718

Change-Id: I806211fb1462e737206e0f2aef762809eaf907f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-11-28 02:17:10 +00:00
committed by Automerger Merge Worker
parent ed4e2b8fc0 262b9d9b41
commit deec945b4d
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -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;
@@ -100,8 +99,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
@@ -510,11 +507,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);
}

8
src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
View File

@@ -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);