Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24289fa0 authored by marcusge's avatar marcusge Committed by Marcus Ge
Browse files

[Contrast] Migrate contrast settings into Display 

Test: local raven device
Bug: 333905689

Change-Id: Ie94633c23ebe024b8fb48d7ffebdd7b1dfa588da
parent ecaa88cc

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
<!--

  ~ 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>
 
 No newline at end of file

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -4688,8 +4688,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

+0 −10
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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>