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

Commit 7a22c5b3 authored by Catherine Liang's avatar Catherine Liang Committed by Automerger Merge Worker
Browse files

Merge "Fix wallpaper picker container colors (2/2)" into udc-qpr-dev am: 63c3cda0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23783023



Change-Id: I45daed6988bec435f07e4a991f48ff936c557f4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ce56f94 63c3cda0

res/drawable/carousel_item_card_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->

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

    android:shape="rectangle">

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

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

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

</shape>
 
 No newline at end of file

res/drawable/clock_color_size_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/clock_color_size_button_corner_radius" />

            <solid android:color="?android:colorControlHighlight" />

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

        </shape>

    </item>

res/drawable/picker_section_icon_background.xml

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

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

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

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

            <corners android:radius="@dimen/option_tile_radius" />

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

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

            <corners android:radius="@dimen/option_tile_radius" />

        </shape>

    </item>

</ripple>

res/drawable/top_connected_section_background.xml

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

  ~ Copyright (C) 2023 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="rectangle">



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



    <corners

        android:topLeftRadius="32dp"

        android:topRightRadius="32dp"

        android:bottomLeftRadius="8dp"

        android:bottomRightRadius="8dp" />

</shape>
 
 No newline at end of file

res/layout/grid_section_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        android:layout_height="@dimen/option_tile_width"

        android:scaleType="center"

        android:src="@drawable/ic_grid_24px"

        android:background="@drawable/option_border_color"

        android:background="@drawable/picker_section_icon_background"

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



</com.android.customization.picker.grid.GridSectionView>
 
 No newline at end of file