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

Commit 535494ec authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "feat(brightness suw): add brightness preferences in suw" into main

parents bbc605ef 042c8c73

aconfig/accessibility/accessibility_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ container: "system_ext" 


# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



flag {

  name: "add_brightness_settings_in_suw"

  namespace: "accessibility"

  description: "Whether to add brightness preference in SUW Vision Settings"

  bug: "332974327"

}



flag {

  name: "edit_shortcuts_in_full_screen"

  namespace: "accessibility"

color-check-baseline.xml

+44 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="4">



    <issue

        id="LintError"

        severity="Error"

        message="No `.class` files were found in project &quot;.&quot;, so none of the classfile based checks could be run. Does the project need to be built first?"

        category="Lint"

        priority="10"

        summary="Lint Failure"

        explanation="This issue type represents a problem running lint itself. Examples include failure to find bytecode for source files (which means certain detectors could not be run), parsing errors in lint configuration files, etc.&#xA;These errors are not errors in your own code, but they are shown to make it clear that some checks were not completed.">

        <location

            file="."/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -4561,6 +4573,38 @@ 
            column="17"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="            android:color=&quot;@color/accessibility_feature_background&quot;/>"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_suw_brightness_auto.xml"

            line="22"

            column="13"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="            android:color=&quot;@color/accessibility_feature_background&quot;/>"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_suw_brightness_level.xml"

            line="22"

            column="13"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

res/drawable/ic_brightness_auto.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="@dimen/accessibility_icon_foreground_size"

    android:height="@dimen/accessibility_icon_foreground_size"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M312,640L376,640L408,548L554,548L586,640L648,640L512,280L448,280L312,640ZM426,496L478,346L482,346L534,496L426,496ZM480,932L346,800L160,800L160,614L28,480L160,346L160,160L346,160L480,28L614,160L800,160L800,346L932,480L800,614L800,800L614,800L480,932ZM480,820L580,720L720,720L720,580L820,480L720,380L720,240L580,240L480,140L380,240L240,240L240,380L140,480L240,580L240,720L380,720L480,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>

</vector>

res/drawable/ic_brightness_medium.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="@dimen/accessibility_icon_foreground_size"

    android:height="@dimen/accessibility_icon_foreground_size"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M480,932L346,800L160,800L160,614L28,480L160,346L160,160L346,160L480,28L614,160L800,160L800,346L932,480L800,614L800,800L614,800L480,932ZM480,680Q563,680 621.5,621.5Q680,563 680,480Q680,397 621.5,338.5Q563,280 480,280L480,680ZM480,820L580,720L720,720L720,580L820,480L720,380L720,240L580,240L480,140L380,240L240,240L240,380L140,480L240,580L240,720L380,720L480,820ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_suw_brightness_auto.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    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"

        android:drawable="@drawable/ic_brightness_auto"/>

</layer-list>
 
 No newline at end of file