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

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

Merge "work profile pause material next change" into sc-mainline-prod

parents 8a83245d eb9fdff4

res/layout/directory_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
    <include layout="@layout/apps_row"/>



    <LinearLayout

        android:id="@+id/header_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/root_info_header_horizontal_padding"

res/layout/item_doc_inflated_message_cross_profile.xml

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<LinearLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"
@@ -64,6 +65,9 @@ 
            android:layout_marginTop="16dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:cornerRadius="@dimen/cross_profile_button_corner_radius"

            app:strokeWidth="@dimen/cross_profile_button_stroke_width"

            app:strokeColor="@color/work_profile_button_stroke_color"

            style="@style/EmptyStateButton"/>

    </LinearLayout>

</LinearLayout>

res/values-h600dp-v31/dimens.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<resources>

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

</resources>

res/values-night-v31/colors.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

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

  <color name="tab_default_background_color">

    @*android:color/system_neutral1_800

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

  <color name="work_profile_button_stroke_color">

    @*android:color/system_neutral1_400

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

</resources>

res/values-night-v31/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -21,4 +21,10 @@ 
        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>

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

    </style>



    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">

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

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

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

    </style>

</resources>