Merge "[Contrast] Migrate contrast settings into Display" into main

AndroidManifest.xml

@@ -2551,9 +2551,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.accessibility.ColorContrastFragment" />
+                android:value="com.android.settings.display.ColorContrastFragment" />
             <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
-                android:value="@string/menu_key_accessibility"/>
+                android:value="@string/menu_key_display"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>

res/drawable/ic_color_contrast.xml

@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright (C) 2024 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <com.android.settingslib.widget.AdaptiveIconShapeDrawable
-            android:width="@dimen/accessibility_icon_size"
-            android:height="@dimen/accessibility_icon_size"
-            android:color="@color/accessibility_feature_background"/>
-    </item>
-    <item android:gravity="center">
-        <vector
-            android:width="@dimen/accessibility_icon_foreground_size"
-            android:height="@dimen/accessibility_icon_foreground_size"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="#ffffff"
-                android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM11,19.93C7.06,19.44 4,16.08 4,12s3.05,-7.44 7,-7.93V19.93zM13,4.07C14.03,4.2 15,4.52 15.87,5H13V4.07zM13,7h5.24c0.25,0.31 0.48,0.65 0.68,1H13V7zM13,10h6.74c0.08,0.33 0.15,0.66 0.19,1H13V10zM13,19.93V19h2.87C15,19.48 14.03,19.8 13,19.93zM18.24,17H13v-1h5.92C18.72,16.35 18.49,16.69 18.24,17zM19.74,14H13v-1h6.93C19.89,13.34 19.82,13.67 19.74,14z"/>
-        </vector>
-    </item>
-</layer-list>

res/values/strings.xml

@@ -4690,8 +4690,6 @@
     <string name="accessibility_color_contrast_intro">Higher contrast makes text, buttons, and icons stand out more. Choose the contrast that looks best to you.</string>
     <!-- Notes in color contrast page footer for something should be aware. [CHAR LIMIT=NONE]  -->
     <string name="color_contrast_note">Some apps may not support all color and text contrast settings</string>
-    <!-- Summary for the accessibility color setting. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_color_contrast_summary">Adjust how colors and text look against your screen\'s background color</string>
     <!-- Preview screen title on the color contrast page. [CHAR LIMIT=20]  -->
     <string name="color_contrast_preview">Preview</string>
     <!-- Preview screen email sender's name on the color contrast page. [CHAR LIMIT=15]  -->

res/xml/accessibility_color_and_motion.xml

@@ -21,16 +21,6 @@
     android:persistent="false"
     android:title="@string/accessibility_color_and_motion_title">
 
-    <Preference
-        android:fragment="com.android.settings.accessibility.ColorContrastFragment"
-        android:key="color_contrast"
-        android:icon="@drawable/ic_color_contrast"
-        android:persistent="false"
-        android:title="@string/accessibility_color_contrast_title"
-        android:summary="@string/accessibility_color_contrast_summary"
-        settings:controller="com.android.settings.accessibility.ContrastPreferenceController"
-        settings:searchable="true"/>
-
     <Preference
         android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
         android:icon="@drawable/ic_daltonizer"

res/xml/accessibility_color_contrast.xml

@@ -28,7 +28,7 @@
         android:key="color_contrast_selector"
         android:selectable="false"
         android:layout="@layout/accessibility_color_contrast_selector"
-        settings:controller="com.android.settings.accessibility.ContrastSelectorPreferenceController" />
+        settings:controller="com.android.settings.display.ContrastSelectorPreferenceController" />
 
     <SwitchPreferenceCompat
         android:key="toggle_high_text_contrast_preference"
@@ -43,6 +43,6 @@
         android:title="@string/color_contrast_note"
         android:selectable="false"
         settings:searchable="false"
-        settings:controller="com.android.settings.accessibility.ColorContrastFooterPreferenceController" />
+        settings:controller="com.android.settings.display.ColorContrastFooterPreferenceController" />
 
 </PreferenceScreen>

res/xml/display_settings.xml

@@ -111,6 +111,14 @@
             android:fragment="com.android.settings.display.ColorModePreferenceFragment"
             settings:controller="com.android.settings.display.ColorModePreferenceController"
             settings:keywords="@string/keywords_color_mode"/>
+
+        <Preference
+            android:fragment="com.android.settings.display.ColorContrastFragment"
+            android:key="color_contrast"
+            android:persistent="false"
+            android:title="@string/accessibility_color_contrast_title"
+            settings:controller="com.android.settings.display.ContrastPreferenceController"
+            settings:searchable="true"/>
     </PreferenceCategory>
 
     <PreferenceCategory

src/com/android/settings/accessibility/ContrastPreferenceController.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.android.settings.core.BasePreferenceController;
-
-/**
- * Controller for {@link ColorContrastFragment}.
- */
-public class ContrastPreferenceController extends BasePreferenceController {
-
-    public ContrastPreferenceController(@NonNull Context context, @NonNull String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        // Hide color contrast entry point inside Accessibility settings.
-        return CONDITIONALLY_UNAVAILABLE;
-    }
-}

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -30,7 +30,6 @@ import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptioningPropertiesFragment;
 import com.android.settings.accessibility.ColorAndMotionFragment;
-import com.android.settings.accessibility.ColorContrastFragment;
 import com.android.settings.accessibility.HearingDevicePairingFragment;
 import com.android.settings.accessibility.TextReadingPreferenceFragment;
 import com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard;
@@ -105,6 +104,7 @@ import com.android.settings.deviceinfo.batteryinfo.BatteryInfoFragment;
 import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
 import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
 import com.android.settings.display.AutoBrightnessSettings;
+import com.android.settings.display.ColorContrastFragment;
 import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.display.ScreenTimeoutSettings;
 import com.android.settings.display.SmartAutoRotatePreferenceFragment;

src/com/android/settings/display/ColorContrastFooterPreferenceController.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
 import com.android.settings.R;
+import com.android.settings.accessibility.AccessibilityFooterPreferenceController;
 
 /** Preference controller for footer in color contrast page. */
 public class ColorContrastFooterPreferenceController extends

src/com/android/settings/display/ColorContrastFragment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import android.app.settings.SettingsEnums;
 
@@ -29,7 +29,6 @@ public class ColorContrastFragment extends DashboardFragment {
 
     private static final String TAG = "ColorContrastFragment";
 
-
     @Override
     protected int getPreferenceScreenResId() {
         return R.xml.accessibility_color_contrast;

src/com/android/settings/display/ContrastPreferenceController.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_HIGH;
+import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_MEDIUM;
+import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_STANDARD;
+import static android.app.UiModeManager.ContrastUtils.toContrastLevel;
+
+import android.app.UiModeManager;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+import com.android.settings.accessibility.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.Map;
+
+/**
+ * Controller for {@link ColorContrastFragment}.
+ */
+public class ContrastPreferenceController extends BasePreferenceController {
+
+    public ContrastPreferenceController(@NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Flags.enableColorContrastControl() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        Map<Integer, Integer> mContrastLevelToResId = Map.ofEntries(
+                Map.entry(CONTRAST_LEVEL_STANDARD, R.string.contrast_default),
+                Map.entry(CONTRAST_LEVEL_MEDIUM, R.string.contrast_medium),
+                Map.entry(CONTRAST_LEVEL_HIGH, R.string.contrast_high)
+        );
+
+        float contrastLevel = mContext.getSystemService(UiModeManager.class).getContrast();
+        return mContext.getString(mContrastLevelToResId.get(toContrastLevel(contrastLevel)));
+    }
+}

src/com/android/settings/display/ContrastSelectorPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_HIGH;
 import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_MEDIUM;

tests/robotests/src/com/android/settings/display/ColorContrastFragmentTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -28,6 +28,7 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settings.accessibility.ShortcutsSettingsFragment;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;

tests/robotests/src/com/android/settings/display/ContrastPreferenceControllerTest.java

@@ -14,15 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.accessibility.Flags;
 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;
@@ -31,19 +38,30 @@ import org.robolectric.RobolectricTestRunner;
 @RunWith(RobolectricTestRunner.class)
 public class ContrastPreferenceControllerTest {
 
+    @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() {
-        mController = new ContrastPreferenceController(ApplicationProvider.getApplicationContext(),
+        mContext = ApplicationProvider.getApplicationContext();
-                PREFERENCE_KEY);
+        mController = new ContrastPreferenceController(mContext, PREFERENCE_KEY);
     }
 
     @Test
-    public void getAvailabilityStatus_shouldReturnUnavailable() {
+    @EnableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL)
+    public void getAvailabilityStatus_flagsEnabled_shouldReturnAvailable() {
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL)
+    public void getAvailabilityStatus_flagsDisabled_shouldReturnUnsupported() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/display/ContrastSelectorPreferenceControllerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.accessibility;
+package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;