Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev (51c92e56) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -18,14 +18,12 @@ package com.android.settings.privacy;

		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.content.Context;
		import android.provider.DeviceConfig;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;
		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.BasePreferenceController;

		import java.util.List;
		@@ -46,10 +44,7 @@ public class AccessibilityUsagePreferenceController extends BasePreferenceContro

		@Override
		public int getAvailabilityStatus() {
		return (mEnabledServiceInfos.isEmpty() \|\| !Boolean.parseBoolean(
		DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
		Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)))
		? UNSUPPORTED_ON_DEVICE : AVAILABLE;
		return mEnabledServiceInfos.isEmpty() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
		}

		@Override

+2 −12

Original line number	Diff line number	Diff line
		@@ -63,16 +63,6 @@ public class AccessibilityUsagePreferenceControllerTest {
		ShadowDeviceConfig.reset();
		}

		@Test
		public void isAvailable_permissionHubNotSet_shouldReturnUnsupported() {
		mAccessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
		AccessibilityUsagePreferenceController controller =
		new AccessibilityUsagePreferenceController(mContext, "test_key");

		// We have not yet set the property to show the Permissions Hub.
		assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
		}

		@Test
		public void getAvailabilityStatus_noEnabledServices_shouldReturnUnsupported() {
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
		@@ -85,9 +75,9 @@ public class AccessibilityUsagePreferenceControllerTest {
		}

		@Test
		public void getAvailabilityStatus_enabledServices_shouldReturnAvailableUnsearchable() {
		public void getAvailabilityStatus_enabledServices_shouldReturnAvailable() {
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
		Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
		Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "false", true);
		mAccessibilityManager.setEnabledAccessibilityServiceList(
		new ArrayList<>(Arrays.asList(new AccessibilityServiceInfo())));
		AccessibilityUsagePreferenceController controller =