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

Commit 2fcdb005 authored by Angela Wang's avatar Angela Wang
Browse files

Add focus state UI for screen flash color selector 

When focusing on a screen flash option in the screen flash color
selector dialog, there's no obvious UI indicates which color is focused
now and makes it hard to use keyboard navigation to select the color.
Adds an alpha circle background to represent the focused state of the
color.

Flag: EXEMPT bugfix
Bug: 407944891
Test: manually test with keyboard
Change-Id: I2c954db3ffc40f698582f6aa83b5567b2bf275b2
parent 1c083542

res/color/screen_flash_color_background.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="@androidprv:color/materialColorControlHighlight" android:state_focused="true" />

    <item android:color="@androidprv:color/materialColorControlHighlight" android:state_hovered="true" />

    <item android:color="@android:color/transparent" />

</selector>
 
 No newline at end of file

res/drawable/screen_flash_color_background.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  -->



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

    android:shape="oval">

    <size

        android:width="@dimen/screen_flash_color_button_frame_size"

        android:height="@dimen/screen_flash_color_button_frame_size" />

    <solid android:color="@color/screen_flash_color_background" />

</shape>
 
 No newline at end of file

res/layout/layout_color_selector.xml

+12 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_01_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_blue" />



            <Space
@@ -49,6 +50,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_02_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_azure" />



            <Space
@@ -61,6 +63,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_03_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_cyan" />



            <Space
@@ -73,6 +76,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_04_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_spring_green" />

        </LinearLayout>
@@ -87,6 +91,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_05_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_green" />



            <Space
@@ -99,6 +104,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_06_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_chartreuse_green" />
@@ -111,6 +117,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_07_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_yellow" />



            <Space
@@ -123,6 +130,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_08_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_orange" />

        </LinearLayout>
@@ -137,6 +145,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_09_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_red" />



            <Space
@@ -149,6 +158,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_10_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_rose" />



            <Space
@@ -161,6 +171,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_11_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_magenta" />



            <Space
@@ -173,6 +184,7 @@ 
                android:layout_width="@dimen/screen_flash_color_button_frame_size"

                android:layout_height="@dimen/screen_flash_color_button_frame_size"

                android:button="@drawable/screen_flash_color_12_selector"

                android:background="@drawable/screen_flash_color_background"

                android:contentDescription="@string/screen_flash_color_violet" />



        </LinearLayout>