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

Commit e24c7605 authored by Maurice Lam's avatar Maurice Lam Committed by Android Git Automerger
Browse files

am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev 

* commit '9ab9d1ec':
  [WifiSetup] Fix text colors in dark theme
parents 1a5d132f 9ab9d1ec

res/values-land/styles.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,13 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>

    </style>





    <style name="wifi_item_content">

    <style name="wifi_item_content">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

    </style>





    <style name="wifi_item_edit_content">

    <style name="wifi_item_edit_content">

res/values-sw600dp-land/styles.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,13 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>

    </style>





    <style name="wifi_item_content">

    <style name="wifi_item_content">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

    </style>





    <style name="wifi_item_edit_content">

    <style name="wifi_item_edit_content">

res/values-sw720dp/styles.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,13 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>

    </style>





    <style name="wifi_item_content">

    <style name="wifi_item_content">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

    </style>





    <style name="wifi_item_edit_content">

    <style name="wifi_item_edit_content">

res/values/styles.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -234,13 +234,13 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>

    </style>





    <style name="wifi_item_content">

    <style name="wifi_item_content">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

    </style>





    <style name="wifi_item_edit_content">

    <style name="wifi_item_edit_content">