From 00b6384d3ccd1c75c59c481309431c20d525f5db Mon Sep 17 00:00:00 2001
From: marcusge <marcusge@google.com>
Date: Mon, 1 Apr 2024 20:36:03 +0000
Subject: [PATCH] [Accessibility] Hide Color Contrast entry point in
 Accessibility

Test: local raven device
Bug: 241805782

Change-Id: I9f0825df68a0c2bdb90ba068b0e4b133cbc8ae57
---
 .../ContrastPreferenceController.java         |  3 +-
 .../ContrastPreferenceControllerTest.java     | 29 +++----------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/com/android/settings/accessibility/ContrastPreferenceController.java b/src/com/android/settings/accessibility/ContrastPreferenceController.java
index 4e9a9ec77e5..33d3087bcc8 100644
--- a/src/com/android/settings/accessibility/ContrastPreferenceController.java
+++ b/src/com/android/settings/accessibility/ContrastPreferenceController.java
@@ -33,6 +33,7 @@ public class ContrastPreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        return Flags.enableColorContrastControl() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        // Hide color contrast entry point inside Accessibility settings.
+        return CONDITIONALLY_UNAVAILABLE;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java
index 219f3d971b1..07c3b54f946 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java
@@ -18,17 +18,11 @@ package com.android.settings.accessibility;
 
 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 com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -37,34 +31,19 @@ import org.robolectric.RobolectricTestRunner;
 @RunWith(RobolectricTestRunner.class)
 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 Context mContext;
     private ContrastPreferenceController mController;
 
     @Before
     public void setUp() {
-        mContext = ApplicationProvider.getApplicationContext();
-        mController = new ContrastPreferenceController(mContext, PREFERENCE_KEY);
+        mController = new ContrastPreferenceController(ApplicationProvider.getApplicationContext(),
+                PREFERENCE_KEY);
     }
 
     @Test
-    public void getAvailabilityStatus_flagsEnabled_shouldReturnAvailable() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL);
-
+    public void getAvailabilityStatus_shouldReturnUnavailable() {
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_flagsDisabled_shouldReturnUnsupported() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL);
-
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 }