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

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

Merge changes from topic "presubmit-am-7b371153d3d14d9eb0ae9de0b14e90af" 

* changes:
  [automerge] fix: work profile material next change 2p: 417a4418
  fix: work profile material next change
parents 3b5d41a7 02474cf4

res/layout/item_doc_inflated_message_cross_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
            android:textAppearance="@style/EmptyStateTitleText"/>

        <TextView

            android:id="@+id/message"

            android:layout_marginTop="4dp"

            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

res/values-night-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
    @*android:color/system_neutral1_800

  </color> <!-- neutral 800 -->

  <color name="work_profile_button_stroke_color">

    @*android:color/system_neutral1_400

  </color> <!-- neutral 400 -->

    @*android:color/system_accent1_200

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

</resources>

res/values-night-v31/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -27,4 +27,11 @@ 
        <item name="fontFamily">@string/config_fontFamilyMedium</item>

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

    </style>



    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">

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

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

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

        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>

    </style>

</resources>

res/values-v31/colors.xml

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

<!-- Copyright (C) 2013 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
@@ -16,5 +15,7 @@ 


<resources>

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

    <color name="work_profile_button_stroke_color">#747775</color> <!-- neutral 500 -->

  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_600

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

</resources>

res/values-v31/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    <dimen name="profile_tab_padding">20dp</dimen>

    <dimen name="cross_profile_button_corner_radius">30dp</dimen>

    <dimen name="cross_profile_button_stroke_width">1dp</dimen>

    <dimen name="cross_profile_button_message_margin_top">16dp</dimen>

</resources>