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

[Accessibility] Hide Color Contrast entry point in Accessibility

Browse Source 
Test: local raven device
Bug: 241805782

Change-Id: I9f0825df68a0c2bdb90ba068b0e4b133cbc8ae57
This commit is contained in:
marcusge
2024-04-01 20:36:03 +00:00
parent 9ec6673b3f
commit 00b6384d3c
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/ContrastPreferenceController.java
View File

@@ -33,6 +33,7 @@ public class ContrastPreferenceController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return Flags.enableColorContrastControl() ? AVAILABLE : UNSUPPORTED_ON_DEVICE; // Hide color contrast entry point inside Accessibility settings.
return CONDITIONALLY_UNAVAILABLE;
} }
} }

29
tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java
View File

@@ -18,17 +18,11 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -37,34 +31,19 @@ import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ContrastPreferenceControllerTest { public class ContrastPreferenceControllerTest {
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREFERENCE_KEY = "preference_key"; private static final String PREFERENCE_KEY = "preference_key";
private Context mContext;
private ContrastPreferenceController mController; private ContrastPreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
mContext = ApplicationProvider.getApplicationContext(); mController = new ContrastPreferenceController(ApplicationProvider.getApplicationContext(),
mController = new ContrastPreferenceController(mContext, PREFERENCE_KEY); PREFERENCE_KEY);
} }
@Test @Test
public void getAvailabilityStatus_flagsEnabled_shouldReturnAvailable() { public void getAvailabilityStatus_shouldReturnUnavailable() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE); .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_flagsDisabled_shouldReturnUnsupported() {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
} }
} }