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

Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev

Browse Source 
am: 51c92e5622

Change-Id: If6446cd203ff92753d6d697e570178cbfd72cd47
This commit is contained in:
Joel Galenson
2019-05-17 19:25:42 -07:00
committed by android-build-merger
parent bc58c1f129 51c92e5622
commit 31db115319
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
View File

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

14
tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
View File

@@ -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 =