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

Commit a835a2dc authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge "Rename the color attr for paging dot indicator used in launcher." into main

parents cfc013fd 34d1db73

quickstep/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -315,5 +315,6 @@ 
    <style name="WidgetPickerActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

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

        <item name="pageIndicatorDotColor">@color/page_indicator_dot_color_light</item>

    </style>

</resources>

res/drawable/page_indicator.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:shape="rectangle">

    <solid android:color="?attr/folderPaginationColor"/>

    <solid android:color="?attr/pageIndicatorDotColor"/>

    <size android:width="@dimen/page_indicator_size" android:height="@dimen/page_indicator_size"/>

</shape>
 
 No newline at end of file

res/values-night/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -22,4 +22,10 @@ 
        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

        <item name="android:windowTranslucentStatus">true</item>

    </style>



    <style name="WidgetPickerActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

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

        <item name="pageIndicatorDotColor">@color/page_indicator_dot_color_dark</item>

    </style>

</resources>

res/values-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ 


    <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>



    <color name="folder_pagination_color_light">@android:color/system_accent1_600</color>

    <color name="folder_pagination_color_dark">@android:color/system_accent1_200</color>

    <color name="page_indicator_dot_color_light">@android:color/system_accent1_600</color>

    <color name="page_indicator_dot_color_dark">@android:color/system_accent1_200</color>



    <color name="home_settings_header_accent">@android:color/system_accent1_600</color>

    <color name="home_settings_header_collapsed">@android:color/system_neutral1_100</color>

res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    <attr name="notificationDotColor" format="color" />

    <attr name="focusOutlineColor" format="color" />



    <attr name="folderPaginationColor" format="color" />

    <attr name="pageIndicatorDotColor" format="color" />

    <attr name="folderPreviewColor" format="color" />

    <attr name="folderBackgroundColor" format="color" />

    <attr name="folderIconRadius" format="float" />