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

Commit 93e6a023 authored by Russell Brenner's avatar Russell Brenner Committed by Android (Google) Code Review
Browse files

Merge "Set divider color for light theme" into klp-dev

parents 86f74d2a 2ef377d4

res/values/colors.xml

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 


    <color name="divider_color">#20ffffff</color>

    <color name="title_color">@android:color/holo_blue_light</color>

    <color name="setup_divider_color">#333333</color>

    <color name="setup_divider_color_dark">#33ffffff</color>

    <color name="setup_divider_color_light">#33000000</color>



    <color name="circle_avatar_frame_color">#ffffffff</color>

    <color name="circle_avatar_frame_shadow_color">#80000000</color>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
    <style name="TopDivider">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">@dimen/divider_height</item>

        <item name="android:background">@color/setup_divider_color</item>

        <item name="android:background">?attr/setup_divider_color</item>

        <item name="android:focusable">false</item>

        <item name="android:clickable">false</item>

        <item name="android:layout_marginTop">@dimen/divider_margin_top</item>

res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    <attr name="ic_menu_add" format="reference" />

    <attr name="ic_menu_moreoverflow" format="reference" />

    <attr name="ic_wps" format="reference" />

    <attr name="setup_divider_color" format="reference" />

    <attr name="wifi_signal" format="reference" />



    <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar">
@@ -27,6 +28,7 @@ 
        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>

        <item name="ic_wps">@drawable/ic_wps_dark</item>

        <item name="setup_divider_color">@color/setup_divider_color_dark</item>

        <item name="wifi_signal">@drawable/wifi_signal_dark</item>

    </style>
@@ -37,6 +39,7 @@ 
        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>

        <item name="ic_wps">@drawable/ic_wps_light</item>

        <item name="setup_divider_color">@color/setup_divider_color_light</item>

        <item name="wifi_signal">@drawable/wifi_signal_light</item>

    </style>