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

Commit 06ea3f59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Resolver profile tab colors and spacing." into main

parents 662c57bb 60fb9869

core/res/res/color-night/resolver_profile_tab_text.xml

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

<!-- Copyright (C) 2022 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:attr/textColorPrimaryInverse" android:state_selected="true"/>

    <item android:color="?androidprv:attr/textColorSecondary"/>

</selector>

core/res/res/color/resolver_profile_tab_text.xml

+3 −4
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
     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:attr/textColorPrimary" android:state_selected="true"/>

    <item android:color="?androidprv:attr/textColorSecondary"/>

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

    <item android:color="@color/materialColorOnPrimary" android:state_selected="true"/>

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

</selector>

core/res/res/drawable/inset_resolver_profile_tab_bg.xml

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

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

  ~

  ~      https://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:drawable="@drawable/resolver_profile_tab_bg"

    android:insetLeft="0dp"

    android:insetRight="0dp"

    android:insetTop="6dp"

    android:insetBottom="6dp" />

core/res/res/drawable/resolver_profile_tab_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ 
            <item android:state_selected="false">

                <shape android:shape="rectangle">

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

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

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

                </shape>

            </item>



            <item android:state_selected="true">

                <shape android:shape="rectangle">

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

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

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

                </shape>

            </item>

        </selector>

core/res/res/layout/resolver_profile_tab_button.xml

+2 −3
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ 
    <Button

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

        android:layout_width="0dp"

        android:layout_height="36dp"

        android:layout_height="48dp"

        android:layout_weight="1"

        android:layout_marginVertical="6dp"

        android:layout_marginHorizontal="@dimen/resolver_profile_tab_margin"

        android:background="@drawable/resolver_profile_tab_bg"

        android:background="@drawable/inset_resolver_profile_tab_bg"

        android:textColor="@color/resolver_profile_tab_text"

        android:textSize="@dimen/resolver_tab_text_size"

        android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"