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

Commit c0fce304 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Change color of the tab underline to match the UX mocks."

parents 27624275 a6f73b83

core/java/com/android/internal/app/ResolverActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,6 @@ public class ResolverActivity extends Activity implements 
        for (int i = 0; i < tabWidget.getChildCount(); i++) {

            TextView title = tabWidget.getChildAt(i).findViewById(android.R.id.title);

            title.setTextColor(getColor(R.color.resolver_tabs_inactive_color));

            title.setAllCaps(false);

        }

    }

core/res/res/drawable/tab_indicator_resolver.xml

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

<!-- Copyright (C) 2020 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"

            android:paddingMode="nest">

    <item>

        <ripple android:color="@color/tab_highlight_material">

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

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

            </item>

        </ripple>

    </item>

    <item android:gravity="bottom">

        <shape android:shape="rectangle"

               android:tint="@color/resolver_tabs_active_color">

            <size android:height="2dp" />

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

        </shape>

    </item>

    <item android:bottom="2dp"

          android:drawable="@color/transparent" />

</layer-list>

core/res/res/layout/tab_indicator_resolver.xml

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

<!--

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

  -->



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

    android:layout_height="?android:attr/actionBarSize"

    android:orientation="horizontal"

    style="@android:style/Widget.Material.Resolver.Tab">



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:visibility="gone" />



    <TextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:textAllCaps="false"

        style="@android:style/Widget.Material.TabText" />



</LinearLayout>

core/res/res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,4 +32,6 @@ 
    <color name="chooser_row_divider">@color/list_divider_color_dark</color>

    <color name="chooser_gradient_background">@color/loading_gradient_background_color_dark</color>

    <color name="chooser_gradient_highlight">@color/loading_gradient_highlight_color_dark</color>



    <color name="resolver_tabs_active_color">#FF8AB4F8</color>

</resources>

core/res/res/values/themes_device_defaults.xml

+9 −0
Original line number Diff line number Diff line
@@ -1679,6 +1679,15 @@ easier. 
        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>

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

        <item name="tabWidgetStyle">@style/Widget.DeviceDefault.Resolver.TabWidget</item>

    </style>



    <style name="Widget.DeviceDefault.Resolver.TabWidget" parent="Widget.DeviceDefault.TabWidget">

        <item name="tabLayout">@layout/tab_indicator_resolver</item>

    </style>



    <style name="Widget.Material.Resolver.Tab" parent="Widget.Material.Tab">

        <item name="background">@drawable/tab_indicator_resolver</item>

    </style>



    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">