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

Commit 094b2106 authored by Shubham Basu's avatar Shubham Basu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-19d77e817aa742a886594fa4e5d8202a" 

* changes:
  [automerge] fix: work profile paused text change 2p: e944b955
  fix: work profile paused text change
parents 086351cf 2680f53c

res/values-night-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_200

  </color> <!-- accent 200 -->

  <color name="empty_state_text">@*android:color/system_neutral1_100</color>

  <color name="empty_state_text_color">@*android:color/system_neutral1_100</color>

  <!-- neutral 100 -->

  <color name="empty_state_message_text">@*android:color/system_neutral2_200

  <color name="empty_state_message_text_color">@*android:color/system_neutral2_200

  </color>

  <!-- neutral variant 200 -->

</resources>

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <color name="secondary">#3D8AB4F8</color>

    <color name="hairline">#5F6368</color>



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

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

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



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

res/values-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_600

  </color> <!-- primary 600 -->

  <color name="empty_state_text">@*android:color/system_neutral1_900</color>

  <color name="empty_state_text_color">@*android:color/system_neutral1_900</color>

    <!-- neutral 900 -->

  <color name="empty_state_message_text">@*android:color/system_neutral2_700

  <color name="empty_state_message_text_color">@*android:color/system_neutral2_700

  </color>

  <!-- neutral variant 700 -->

</resources>

res/values-v31/styles_text.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
-->

<resources>

    <style name="EmptyStateTitleText">

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

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

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

        <item name="fontFamily">@string/config_headerFontFamily</item>

    </style>



    <style name="EmptyStateMessageText">

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

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

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

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
    <color name="shortcut_foreground">#ff3367d6</color>

    <color name="shortcut_background">#fff5f5f5</color>



    <color name="empty_state_text">#202124</color>

    <color name="empty_state_text_color">#202124</color>

    <color name="error_image_color">#757575</color>



    <color name="edge_effect">@android:color/black</color>