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

Commit 3b914126 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12378824 from ad856d32 to 24Q4-release 

Change-Id: I384501a1d8990fac19ac77ff6e729cbc7786b5c3
parents 911cab80 ad856d32

res/drawable/pointer_fill_check_24dp.xml

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

<!-- Copyright 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="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"

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

</vector>

res/drawable/pointer_icon_fill_color_background.xml

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

<!--

     Copyright 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.

-->

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

    android:insetBottom="@dimen/pointer_fill_style_circle_offset"

    android:insetLeft="@dimen/pointer_fill_style_circle_offset"

    android:insetRight="@dimen/pointer_fill_style_circle_offset"

    android:insetTop="@dimen/pointer_fill_style_circle_offset">

    <shape android:shape="oval">

        <size

            android:width="@dimen/pointer_fill_style_circle_inner_diameter"

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

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

    </shape>

</inset>

res/drawable/pointer_icon_fill_color_foreground.xml

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

<!--

     Copyright 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.

-->

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

    <item android:state_selected="true" android:state_hovered="true">

        <layer-list>

            <item>

                <shape android:shape="oval">

                    <size android:width="@dimen/pointer_fill_style_circle_hover_selected_diameter"

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

                    <stroke android:width="@dimen/pointer_fill_style_shape_hovered_stroke"

                        android:color="@color/pointer_fill_outline_color" />

                </shape>

            </item>

            <item

                android:top="@dimen/pointer_fill_style_checkmark_hovered_padding"

                android:left="@dimen/pointer_fill_style_checkmark_hovered_padding"

                android:bottom="@dimen/pointer_fill_style_checkmark_hovered_padding"

                android:right="@dimen/pointer_fill_style_checkmark_hovered_padding"

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

        </layer-list>

    </item>

    <item android:state_selected="true">

        <layer-list>

            <item>

                <inset android:insetTop="@dimen/pointer_fill_style_circle_selected_offset"

                    android:insetLeft="@dimen/pointer_fill_style_circle_selected_offset"

                    android:insetBottom="@dimen/pointer_fill_style_circle_selected_offset"

                    android:insetRight="@dimen/pointer_fill_style_circle_selected_offset">

                    <shape android:shape="oval">

                        <size android:width="@dimen/pointer_fill_style_circle_selected_diameter"

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

                        <stroke android:width="@dimen/pointer_fill_style_shape_selected_stroke"

                            android:color="@color/pointer_fill_outline_color" />

                    </shape>

                </inset>

            </item>

            <item

                android:top="@dimen/pointer_fill_style_checkmark_selected_padding"

                android:left="@dimen/pointer_fill_style_checkmark_selected_padding"

                android:bottom="@dimen/pointer_fill_style_checkmark_selected_padding"

                android:right="@dimen/pointer_fill_style_checkmark_selected_padding"

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

        </layer-list>

    </item>

    <item android:state_hovered="true">

        <shape android:shape="oval">

            <size android:width="@dimen/pointer_fill_style_circle_hover_diameter"

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

            <stroke android:width="@dimen/pointer_fill_style_shape_hovered_stroke"

                android:color="@color/pointer_fill_outline_color" />

        </shape>

    </item>

</selector>

res/drawable/pointer_icon_fill_style_background.xml→res/drawable/pointer_icon_fill_container_background.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

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

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

    android:shape="rectangle">

    android:shape="rectangle">

    <corners android:radius="16dp" />

    <corners android:radius="20dp" />

    <solid android:color="?androidprv:attr/materialColorSurface"/>

    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>

</shape>
 
</shape>

res/layout/pointer_icon_fill_style_layout.xml

+143 −66
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
  -->

  -->





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

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:gravity="center_vertical"
@@ -30,73 +31,149 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

        android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

        android:text="@string/pointer_fill_style"

        android:text="@string/pointer_fill_style"

        android:textSize="14sp"

        android:textColor="?androidprv:attr/materialColorPrimary"

        android:textAlignment="viewStart"

        android:textAlignment="viewStart"

        android:textAppearance="?android:attr/textAppearanceListItem" />

        android:fontWeight="500" />



    <HorizontalScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content">





    <LinearLayout

    <LinearLayout

        android:id="@+id/button_holder"

        android:id="@+id/button_holder"

            android:layout_width="wrap_content"

        android:layout_width="@dimen/pointer_fill_container_max_width"

            android:layout_height="wrap_content"

        android:layout_height="@dimen/pointer_fill_container_height"

        android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding"

        android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding"

        android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

        android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

            android:background="@drawable/pointer_icon_fill_style_background"

        android:background="@drawable/pointer_icon_fill_container_background"

            android:gravity="center_horizontal"

        android:gravity="center"

            android:padding="@dimen/pointer_fill_style_circle_padding">

        android:paddingTop="@dimen/pointer_fill_style_container_padding"

        android:paddingBottom="@dimen/pointer_fill_style_container_padding">



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="4" />





        <ImageView

        <ImageView

            android:id="@+id/button_black"

            android:id="@+id/button_black"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

            android:adjustViewBounds="true"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:contentDescription="@string/pointer_fill_style_black_button"

            android:contentDescription="@string/pointer_fill_style_black_button"

                android:scaleType="fitCenter" />

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="3" />





        <ImageView

        <ImageView

            android:id="@+id/button_green"

            android:id="@+id/button_green"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

            android:adjustViewBounds="true"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:contentDescription="@string/pointer_fill_style_green_button"

            android:contentDescription="@string/pointer_fill_style_green_button"

                android:scaleType="fitCenter" />

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="3" />





        <ImageView

        <ImageView

                android:id="@+id/button_yellow"

            android:id="@+id/button_red"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

            android:adjustViewBounds="true"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_yellow_button"

            android:contentDescription="@string/pointer_fill_style_red_button"

                android:scaleType="fitCenter" />

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="3" />





        <ImageView

        <ImageView

            android:id="@+id/button_pink"

            android:id="@+id/button_pink"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

            android:adjustViewBounds="true"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:contentDescription="@string/pointer_fill_style_pink_button"

            android:contentDescription="@string/pointer_fill_style_pink_button"

                android:scaleType="fitCenter" />

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="3" />





        <ImageView

        <ImageView

            android:id="@+id/button_blue"

            android:id="@+id/button_blue"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

            android:adjustViewBounds="true"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:contentDescription="@string/pointer_fill_style_blue_button"

            android:contentDescription="@string/pointer_fill_style_blue_button"

                android:scaleType="fitCenter" />

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="3" />



        <ImageView

            android:id="@+id/button_purple"

            android:layout_width="@dimen/pointer_fill_style_circle_diameter"

            android:layout_weight="0"

            android:layout_height="@dimen/pointer_fill_style_circle_diameter"

            android:adjustViewBounds="true"

            android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

            android:contentDescription="@string/pointer_fill_style_purple_button"

            android:scaleType="center"

            android:background="@drawable/pointer_icon_fill_color_background"

            android:src="@drawable/pointer_icon_fill_color_foreground" />



        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:focusable="false"

            android:clickable="false"

            android:importantForAccessibility="no"

            android:layout_weight="4" />

    </LinearLayout>

    </LinearLayout>

    </HorizontalScrollView>





</LinearLayout>
 
</LinearLayout>