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

Commit e57b2e6b authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Create TAB layout Material You style" into tm-dev am: cf7ce086 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004329

Change-Id: Ib601b7c39e5c4b98a7c8576363f8c55211e45ea4
parents 1686dca9 cf7ce086

packages/SettingsLib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ android_library { 
        "androidx.appcompat_appcompat",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.mediarouter_mediarouter-nodeps",

        "com.google.android.material_material",

        "iconloader",



        "WifiTrackerLibRes",

packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml

+5 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <!-- Dialog accent color -->

    <color name="settingslib_dialog_accent">@android:color/system_accent1_100</color>

    <!-- Dialog background color. -->

    <color name="settingslib_dialog_background">@android:color/system_neutral1_800</color>

    <color name="settingslib_dialog_background">@color/settingslib_surface_dark</color>

    <!-- Dialog error color. -->

    <color name="settingslib_dialog_colorError">#f28b82</color> <!-- Red 300 -->
@@ -49,4 +49,8 @@ 
    <color name="settingslib_text_color_preference_category_title">@android:color/system_accent1_100</color>



    <color name="settingslib_ripple_color">@color/settingslib_material_grey_900</color>



    <color name="settingslib_surface_dark">@android:color/system_neutral1_800</color>



    <color name="settingslib_colorSurface">@color/settingslib_surface_dark</color>

</resources>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+7 −0
Original line number Diff line number Diff line
@@ -71,5 +71,12 @@ 
    <color name="settingslib_text_color_preference_category_title">@android:color/system_accent1_600</color>



    <color name="settingslib_ripple_color">?android:attr/colorControlHighlight</color>



    <color name="settingslib_material_grey_900">#ff212121</color>



    <color name="settingslib_colorAccentPrimary">@color/settingslib_accent_primary_device_default</color>



    <color name="settingslib_colorAccentSecondary">@color/settingslib_accent_secondary_device_default</color>



    <color name="settingslib_colorSurface">@color/settingslib_surface_light</color>

</resources>

packages/SettingsLib/res/color-night-v31/settingslib_tabs_indicator_color.xml

0 → 100644
+19 −0
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">

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

</selector>
 
 No newline at end of file

packages/SettingsLib/res/color-night-v31/settingslib_tabs_text_color.xml

0 → 100644
+21 −0
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">

    <item android:state_selected="true" android:color="?android:attr/textColorPrimaryInverse"/>

    <item android:state_enabled="false" android:color="?android:attr/textColorTertiary"/>

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

</selector>
 
 No newline at end of file